[geary/pantheon_mail: 17/32] Launchpad automatic translations update.



commit c6208a3931aebb50f08899de327574a649f5d141
Author: Launchpad Translations on behalf of elementary-apps <Unknown>
Date:   Mon Nov 23 05:56:55 2015 +0000

    Launchpad automatic translations update.

 po/ar.po       | 2181 +++++++++++++++++++++++----------------------
 po/bs.po       | 2452 +++++++++++++++++++++++---------------------------
 po/ca.po       | 2207 +++++++++++++++++-----------------------------
 po/cs.po       | 2542 +++++++++++++++++++++++-----------------------------
 po/da.po       | 2566 +++++++++++++++++++++++++++++------------------------
 po/de.po       | 2546 +++++++++++++++++++++++-----------------------------
 po/el.po       | 2477 ++++++++++++++++++++++++---------------------------
 po/en_CA.po    | 2095 ++++++++++++++++++++++---------------------
 po/en_GB.po    | 2562 ++++++++++++++++++++++++++++------------------------
 po/eo.po       | 1888 +++++++++++++++++++--------------------
 po/es.po       | 2528 +++++++++++++++++++++++----------------------------
 po/et.po       | 2278 +++++++++++++++++++++++++----------------------
 po/eu.po       | 2346 ++++++++++++++++++++++++------------------------
 po/fa.po       | 2552 ++++++++++++++++++++++++++++------------------------
 po/fi.po       | 2527 +++++++++++++++++++++++----------------------------
 po/fr.po       | 2534 +++++++++++++++++++++++----------------------------
 po/gl.po       | 2161 +++++++++++++++++++++++---------------------
 po/he.po       | 2509 +++++++++++++++++++++++----------------------------
 po/hi.po       | 1794 ++++++++++++++++++-------------------
 po/hr.po       | 2582 +++++++++++++++++++++++++++++------------------------
 po/hu.po       | 2533 +++++++++++++++++++++++-----------------------------
 po/id.po       | 2417 +++++++++++++++++++++++--------------------------
 po/it.po       | 2530 +++++++++++++++++++++++----------------------------
 po/ja.po       | 2259 ++++++++++++++++++++++++----------------------
 po/kk.po       | 2446 ++++++++++++++++++++++---------------------------
 po/km.po       | 2009 +++++++++++++++++++++---------------------
 po/lt.po       | 2542 +++++++++++++++++++++++-----------------------------
 po/ms.po       | 2551 ++++++++++++++++++++++++++++------------------------
 po/nb.po       | 2502 +++++++++++++++++++++++----------------------------
 po/nl.po       | 2617 ++++++++++++++++++++++++++---------------------------
 po/pl.po       | 2556 +++++++++++++++++++++++-----------------------------
 po/pt.po       | 2745 +++++++++++++++++++++++++-------------------------------
 po/pt_BR.po    | 2450 ++++++++++++++++++++++++---------------------------
 po/ro.po       | 2599 +++++++++++++++++++++++++----------------------------
 po/ru.po       | 2553 +++++++++++++++++++++++-----------------------------
 po/sk.po       | 2580 ++++++++++++++++++++++++-----------------------------
 po/sl.po       | 2404 ++++++++++++++++++++++++-------------------------
 po/sr.po       | 2572 ++++++++++++++++++++++++-----------------------------
 po/sr latin po | 2463 +++++++++++++++++++++++---------------------------
 po/sv.po       | 2518 +++++++++++++++++++++++----------------------------
 po/te.po       | 1852 ++++++++++++++++++--------------------
 po/tr.po       | 2571 +++++++++++++++++++++++++----------------------------
 po/uk.po       | 2445 ++++++++++++++++++++++++--------------------------
 po/vi.po       | 1843 ++++++++++++++++++--------------------
 po/zh_CN.po    | 2327 ++++++++++++++++++++++++------------------------
 po/zh_TW.po    | 2503 +++++++++++++++++++++++----------------------------
 46 files changed, 52600 insertions(+), 58114 deletions(-)
---
diff --git a/po/ar.po b/po/ar.po
index 7892527..3cf00b4 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10,1524 +10,1561 @@ 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-10-01 18:00+0000\n"
-"Last-Translator: Humaidan Mohammed <contact humaidan tk>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/geary/language/";
-"ar/)\n"
-"Language: ar\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 00:57+0000\n"
+"Last-Translator: Humaidan Mohammed <Unknown>\n"
+"Language-Team: Arabic "
+"(http://www.transifex.com/projects/p/geary/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
+"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:53+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: ar\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:641
-msgid "        &#8226; Connection error.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:624
-msgid "        &#8226; Email address already added to Geary.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:628
-msgid "        &#8226; IMAP connection error.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:631
-msgid "        &#8226; IMAP username or password incorrect.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:621
-msgid "        &#8226; Invalid account nickname.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:634
-msgid "        &#8226; SMTP connection error.\n"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "صندوق الوارد"
 
-#: ../../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "المسودات"
 
-#: ../../src/client/accounts/add-edit-page.vala:645
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "البريد المرسل"
 
-#: ../../src/client/views/conversation-viewer.vala:1203
-msgid " (Invalid?)"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "متألقة"
 
-#: ../../src/client/composer/composer-window.vala:972
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" موجود بالفعل في المرفقات للتوصيل"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "هام"
 
-#: ../../src/client/composer/composer-window.vala:937
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "لا يمكن إيجاد \"%s\"."
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "كل البريد"
 
-#: ../../src/client/composer/composer-window.vala:965
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "\"%s\" لا يمكن فتحها للقراءة"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "رسال مزعجة"
 
-#: ../../src/client/composer/composer-window.vala:944
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" هو مجلد"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "سلة المهملات"
 
-#: ../../src/client/composer/composer-window.vala:951
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" هو ملف خالي."
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "الصادر"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
 msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr ""
 
-#. / 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 "%B %-e, %Y %-l:%M %P"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "لا شئ"
 
-#. / 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 "%B %-e, %Y %-l:%M %P"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr ""
 
-#. / 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, %b %-e, %Y at %-l:%M %p"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#. / 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 "%b %-e"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "بريد Yahoo!"
 
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d صفر رسالة جديدة"
-msgstr[1] "%d رسالة جديدة"
-msgstr[2] "%d رسالتان جديدتان"
-msgstr[3] "%d رسائل جديدة"
-msgstr[4] "%d رسائل جديدة"
-msgstr[5] "%d رسائل جديدة"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "اخري"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:43
-#, c-format
-msgid "%d results"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
 msgstr ""
 
-#. / 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] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr ""
 
-#: ../../src/client/util/util-date.vala:170
-#, c-format
-msgid "%dh ago"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
 msgstr ""
 
-#: ../../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
 msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:222
-#, c-format
-msgid "%i matches"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
 msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:224
-#, c-format
-msgid "%i matches (wrapped)"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
 msgstr ""
 
-#. / 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"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr ""
 
-#. / 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"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:107
-#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(لا يوجد موضوع)"
 
-#. / 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 ""
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %b %-e, %Y at %-l:%M %p"
 
-#: ../../src/client/views/conversation-web-view.vala:289
-#, c-format
-msgid "%s - Conversation Inspector"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
 msgstr ""
 
-#: ../../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - رسائل جديدة"
-
 #. / 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
+#: ../src/engine/rfc822/rfc822-utils.vala:228
 msgid "%s wrote:"
 msgstr "%s كتب:"
 
-#: ../../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#. / 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"
+#. / 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:234
+msgid "On %s:"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:246
-#, c-format
-msgid "%u conversations selected."
-msgstr "%u المحادثة مختارة."
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- رسالة معاد توجيهها ----------"
 
-#: ../../src/client/views/conversation-viewer.vala:743
-#, c-format
-msgid "%u read messages"
-msgstr "%u قراءة الرسائل"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "من: %s\n"
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr ""
 
-#: ../../src/client/util/util-email.vala:30
-msgid "(no subject)"
-msgstr "(لا يوجد موضوع)"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "التاريخ: %s\n"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- رسالة معاد توجيهها ----------"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "الي: %s\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:211
-msgid "1 month back"
-msgstr "منذ شهر"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:214
-msgid "1 year back"
-msgstr "منذ سنة"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "لا شئ"
 
-#: ../../src/client/accounts/add-edit-page.vala:210
-msgid "2 weeks back"
-msgstr "منذ إسبوعين"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "برنامج البريد"
 
-#: ../../src/client/accounts/add-edit-page.vala:212
-msgid "3 months back"
-msgstr "منذ 3 اسابيع"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:213
-msgid "6 months back"
-msgstr "منذ 6 اسابيع"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "زيارة موقع يوربا الالكتروني"
 
-#: ../../ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
 msgstr ""
 
-#: ../../ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#: ../src/client/application/geary-controller.vala:62
+msgid "Delete conversation (Shift+Delete)"
 msgstr ""
 
-#: ../../ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/application/geary-controller.vala:63
+msgid "Delete conversations (Shift+Delete)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1491
-#, c-format
-msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr "يوجد بالفعل ملف يسمي \"%s\" . هل تريد استبداله؟"
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:245
-msgid "A_ccounts"
-msgstr "الحسابات"
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:1227
-#, c-format
-msgid "About %s"
-msgstr "عن %s"
+#: ../src/client/application/geary-controller.vala:72
+msgid "_Archive"
+msgstr "_أرشيف"
 
-#: ../../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "الحسابات"
+#: ../src/client/application/geary-controller.vala:73
+msgid "Archive conversation (A)"
+msgstr ""
 
-#: ../../ui/account_list.glade:71
-msgid "Add account"
+#: ../src/client/application/geary-controller.vala:74
+msgid "Archive conversations (A)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:304
-msgid "Add label"
+#: ../src/client/application/geary-controller.vala:77
+msgid "Mark as S_pam"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:78
+msgid "Mark as not S_pam"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
+msgid "Mark conversation"
+msgstr "تأشير المحادثة"
+
+#: ../src/client/application/geary-controller.vala:81
+msgid "Mark conversations"
+msgstr "تأشير المحادثات"
+
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "إضافة وسم للمحادثة"
 
-#: ../../src/client/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "إضافة وسم للمحادثات"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "كل البريد"
-
-#: ../../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 ""
-
-#: ../../src/client/geary-args.vala:24
-msgid "Allow inspection of WebView"
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
+msgid "Move conversation"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:509
-msgid "Always Show From Sender"
+#: ../src/client/application/geary-controller.vala:85
+msgid "Move conversations"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:372
+msgid "A_ccounts"
+msgstr "الحسابات"
 
-#: ../../src/client/geary-controller.vala:48
-msgid "Archive conversation (Delete, Backspace, A)"
-msgstr "المحادثة إلي الإرشيف (Delete, Backspace, A) "
+#: ../src/client/application/geary-controller.vala:377
+#: ../src/client/components/stock.vala:27
+msgid "_Preferences"
+msgstr "_التفضيلات"
 
-#: ../../src/client/geary-controller.vala:49
-msgid "Archive conversations (Delete, Backspace, A)"
-msgstr "المحادثات إلي الإرشيف (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/components/stock.vala:25
+msgid "_Help"
+msgstr "_مساعدة"
 
-#: ../../src/client/geary-controller.vala:1477
-#, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr "هل انت متأكد بانك تريد فتح \"%s\"؟"
+#: ../src/client/application/geary-controller.vala:385
+#: ../src/client/components/stock.vala:21
+msgid "_About"
+msgstr "_عن"
 
-#: ../../src/client/geary-controller.vala:1478
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
-msgstr ""
-"المرفقات قد تسبب ضررا للنظام عند فتحها. افتح فقط المرفقات التي تثق في مصدرها."
+#: ../src/client/application/geary-controller.vala:389
+#: ../src/client/components/stock.vala:29
+msgid "_Quit"
+msgstr "_الخروج"
 
-#: ../../src/client/views/conversation-viewer.vala:614
-msgid "Bcc:"
-msgstr "Bcc:"
+#: ../src/client/application/geary-controller.vala:394
+msgid "_Mark as..."
+msgstr "_علم كـ"
 
-#: ../../ui/composer.glade:113
-msgid "Bold (Ctrl+B)"
+#: ../src/client/application/geary-controller.vala:400
+msgid "Mark as _Read"
 msgstr ""
 
-#: ../../ui/composer.glade:69
-msgid "C_olor"
-msgstr "اللون"
+#: ../src/client/application/geary-controller.vala:406
+msgid "Mark as _Unread"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:926
-msgid "Cannot add attachment"
-msgstr "لا يمكن اضافة المرفقات"
+#: ../src/client/application/geary-controller.vala:412
+msgid "_Star"
+msgstr "_نجمة"
 
-#: ../../src/client/views/conversation-viewer.vala:611
-msgid "Cc:"
-msgstr "Cc:"
+#: ../src/client/application/geary-controller.vala:417
+msgid "U_nstar"
+msgstr "الغاء التميز بنجمة"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
+#: ../src/client/application/geary-controller.vala:427
+msgid "Add label"
 msgstr ""
 
-#: ../../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "اختر ملف"
-
-#: ../../src/client/geary-controller.vala:553
-msgid "Co_ntinue"
-msgstr "استمرار"
+#: ../src/client/application/geary-controller.vala:428
+msgid "_Label"
+msgstr "_وسم"
 
-#: ../../src/client/geary-application.vala:29
-msgid "Compose Message"
-msgstr "اكتب رسالة جديدة"
+#: ../src/client/application/geary-controller.vala:432
+msgid "_Move"
+msgstr "_انقل"
 
-#: ../../src/client/geary-controller.vala:313
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr ""
 
-#: ../../ui/preferences.glade:117
-msgid "Composer"
-msgstr "الكاتب"
-
-#: ../../src/client/views/conversation-viewer.vala:897
-msgid "Copy _Email Address"
-msgstr "نسخ عنوان البريد الالكتروني"
-
-#: ../../src/client/views/conversation-viewer.vala:902
-msgid "Copy _Link"
-msgstr "نسخ الرابط"
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
+msgid "_Reply"
+msgstr "_رد"
 
-#: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr "جميع الحقوق محفوظة 2011-2013 Yorba Foundation."
+#: ../src/client/application/geary-controller.vala:441
+msgid "Reply (Ctrl+R, R)"
+msgstr ""
 
-#: ../../ui/composer.glade:21
-msgid "Cu_t"
+#: ../src/client/application/geary-controller.vala:445
+msgid "R_eply All"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:620
-msgid "Date:"
-msgstr "التاريخ:"
+#: ../src/client/application/geary-controller.vala:446
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+msgstr ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "التاريخ: %s\n"
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
+msgid "_Forward"
+msgstr "_اعادة توجيه رسالة"
 
-#: ../../src/client/geary-controller.vala:43
-msgid "Delete conversation (Delete, Backspace, A)"
-msgstr "مسح المحادثة (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:452
+msgid "Forward (Ctrl+L, F)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:44
-msgid "Delete conversations (Delete, Backspace, A)"
-msgstr "مسح المحادثات (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:25
-msgid "Display program version"
-msgstr "عرض اصدار البرنامج"
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:663
-msgid "Do you want to discard the unsaved message?"
-msgstr "هل تريد تجاهل الرسالة التي لم يتم حفظها؟"
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:666
-msgid "Do you want to discard this message?"
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1479
-msgid "Don't _ask me again"
-msgstr "لا تسألني مرة اخرة"
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "المسودات"
+#: ../src/client/application/geary-controller.vala:746
+msgid "Unable to store server trust exception"
+msgstr ""
 
-#: ../../ui/composer.glade:419
-msgid "Drop files here"
-msgstr "اسقاط الملفات هنا"
+#: ../src/client/application/geary-controller.vala:983
+msgid "Your settings are insecure"
+msgstr "اعداداتك غير أمنة"
 
-#: ../../ui/login.glade:115
-msgid "E_mail address:"
+#: ../src/client/application/geary-controller.vala:984
+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 ""
+"اعداداتك لـIMAP و\\او SMTP لا تحدد SSL او TLS. هذا يعني ان اسم المستخدم و "
+"كلمة السر الخاصة بك قد تقرأ بواسطة شخص اخر علي الشبكة. هل انت متأكدة بانك "
+"تريد الاستمرار؟"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "E_xit"
+#: ../src/client/application/geary-controller.vala:985
+msgid "Co_ntinue"
+msgstr "استمرار"
+
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/components/status-bar.vala:29
+msgid "Error sending email"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:533
-msgid "Edit Draft"
+#: ../src/client/application/geary-controller.vala:1064
+msgid ""
+"Geary encountered an error sending an email.  If the problem persists, "
+"please manually delete the email from your Outbox folder."
 msgstr ""
 
-#: ../../ui/account_list.glade:84
-msgid "Edit account"
+#: ../src/client/application/geary-controller.vala:1068
+#: ../src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
 msgstr ""
 
-#: ../../ui/remove_confirm.glade:94
-msgid "Email address:"
+#: ../src/client/application/geary-controller.vala:1069
+msgid ""
+"Geary encountered an error saving a sent message to Sent Mail.  The message "
+"will stay in your Outbox folder until you delete it."
 msgstr ""
 
-#: ../../src/client/geary-application.vala:28
-msgid "Email;E-mail;Mail;"
+#: ../src/client/application/geary-controller.vala:1138
+msgid "Labels"
+msgstr "المسميات"
+
+#: ../src/client/application/geary-controller.vala:1150
+msgid "Unable to open the database for %s"
 msgstr ""
 
-#: ../../ui/preferences.glade:131
-msgid "Enable _spell checking"
-msgstr "تمكين _التدقيق الاملائي"
+#: ../src/client/application/geary-controller.vala:1151
+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 ""
 
-#: ../../ui/login.glade:588
-msgid "Encr_yption:"
-msgstr "التشفير:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "_Rebuild"
+msgstr ""
 
-#: ../../ui/login.glade:607
-msgid "Encrypt_ion:"
-msgstr "التشفير:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "E_xit"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-msgid "Enter your account information to get started."
-msgstr "ادخل معلومات حسابك لتبدأ"
+#: ../src/client/application/geary-controller.vala:1162
+msgid "Unable to rebuild database for \"%s\""
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:714
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:43
-msgid "Error saving"
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
+msgid "Unable to open local mailbox for %s"
 msgstr ""
 
-#. / 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"
+#: ../src/client/application/geary-controller.vala:1186
+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 ""
 
-#: ../../src/client/accounts/add-edit-page.vala:216
-msgid "Everything"
-msgstr "الكل"
+#: ../src/client/application/geary-controller.vala:1196
+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 ""
 
-#: ../../src/client/views/conversation-viewer.vala:1897
-msgid "Failed to open default text editor."
-msgstr "فشلة في محاولة فتح محرر النصوص الافتراضي "
+#: ../src/client/application/geary-controller.vala:1207
+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 ""
 
-#: ../../src/client/geary-args.vala:54
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "فشل في تحليل خيارات سطر الاوامر: %s\n"
+#: ../src/client/application/geary-controller.vala:1715
+msgid "About %s"
+msgstr "عن %s"
 
-#. / 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"
+#. / 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-controller.vala:1718
+msgid "translator-credits"
 msgstr ""
+"المترجم\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Humaidan Mohammed https://launchpad.net/~5-ckntact-r";
 
-#: ../../ui/composer.glade:182
-msgid "Fixed Width"
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:329
-msgid "Forward (Ctrl+L, F)"
+#: ../src/client/application/geary-controller.vala:1986
+msgid "Are you sure you want to open \"%s\"?"
+msgstr "هل انت متأكد بانك تريد فتح \"%s\"؟"
+
+#: ../src/client/application/geary-controller.vala:1987
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
 msgstr ""
+"المرفقات قد تسبب ضررا للنظام عند فتحها. افتح فقط المرفقات التي تثق في مصدرها."
 
-#: ../../src/client/views/conversation-viewer.vala:605
-msgid "From:"
-msgstr "من:"
+#: ../src/client/application/geary-controller.vala:1988
+msgid "Don't _ask me again"
+msgstr "لا تسألني مرة اخرة"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "من: %s\n"
+#: ../src/client/application/geary-controller.vala:2006
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr "يوجد بالفعل ملف يسمي \"%s\" . هل تريد استبداله؟"
 
-#: ../../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "جيجا بايت"
+#: ../src/client/application/geary-controller.vala:2008
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr "الملف موجود بالفعل في  \"%s\". استبداله سوف يعيد كتابة محتوياته"
 
-#: ../../src/client/geary-application.vala:25
-msgid "Geary Mail"
-msgstr "بريد Geary"
+#: ../src/client/application/geary-controller.vala:2011
+msgid "_Replace"
+msgstr "_استبدال"
 
-#: ../../src/client/geary-controller.vala:626
-msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+#: ../src/client/application/geary-controller.vala:2309
+msgid "Close open draft messages?"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:315
-msgid "General"
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
 msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
-
-#: ../../ui/password-dialog.glade:133
-msgid "IMAP Credentials"
-msgstr "اعتمادات الـIMAP"
-
-#: ../../ui/login.glade:572
-msgid "IMAP password"
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
 msgstr ""
 
-#: ../../ui/login.glade:286 ../../ui/password-dialog.glade:334
-msgid "IMAP settings"
-msgstr "اعدادات الـIMAP"
-
-#: ../../ui/login.glade:556
-msgid "IMAP username"
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "هام"
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "صندوق الوارد"
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
+msgstr ""
 
-#: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "صناديق الوارد"
+#: ../src/client/application/geary-controller.vala:2489
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/ui/main-toolbar.vala:163
-#, c-format
-msgid "Indexing %s account"
+#: ../src/client/application/geary-controller.vala:2491
+msgid "Delete"
 msgstr ""
 
-#: ../../ui/composer.glade:120
-msgid "Italic (Ctrl+I)"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
 msgstr ""
 
-#: ../../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "كيلو بايت"
-
-#: ../../src/client/geary-controller.vala:689
-msgid "Labels"
-msgstr "المسميات"
-
-#: ../../ui/composer.glade:151
-msgid "Lar_ge"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
 msgstr ""
 
-#: ../../ui/composer.glade:152
-msgid "Large"
-msgstr "كبير"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
+msgstr ""
 
-#: ../../ui/composer.glade:62
-msgid "Link (Ctrl+L)"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
 msgstr ""
 
-#. / 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 "تسجيل ردود IMAP "
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "معلومات معرفة المشكلة للمخرجات"
 
-#: ../../src/client/geary-args.vala:11
+#: ../src/client/application/geary-args.vala:12
 msgid "Log conversation monitoring"
 msgstr "تسجيل مراقبة المحادثات"
 
-#: ../../src/client/geary-args.vala:21
-msgid "Log database queries (generates lots of messages)"
-msgstr "تسجيل قاعدة معلومات الاستعلامات (تولد الكثير من الرسائل)"
-
-#. / "Normalization" can also be called "synchronization"
-#: ../../src/client/geary-args.vala:23
-msgid "Log folder normalization"
-msgstr "تسجيل تطبيع المجلد"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:13
+#: ../src/client/application/geary-args.vala:14
 msgid "Log network activity"
 msgstr "تسجيل نشاط الشبكة"
 
-#: ../../src/client/geary-args.vala:12
-msgid "Log network deserialization"
-msgstr ""
+#. / 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 "تسجيل ردود IMAP"
 
 #. / Serialization is how commands and responses are converted into a stream of bytes for
 #. / network transmission
-#: ../../src/client/geary-args.vala:19
+#: ../src/client/application/geary-args.vala:20
 msgid "Log network serialization"
 msgstr "تسجيل تسلسل الشبكة"
 
-#: ../../src/client/geary-args.vala:20
+#: ../src/client/application/geary-args.vala:21
 msgid "Log periodic activity"
 msgstr "تسجيل النشاطات المتكررة"
 
-#: ../../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "ميجا بايت"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "تسجيل قاعدة معلومات الاستعلامات (تولد الكثير من الرسائل)"
 
-#: ../../src/client/geary-application.vala:26
-msgid "Mail Client"
-msgstr "برنامج البريد"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "تسجيل تطبيع المجلد"
 
-#: ../../src/client/views/conversation-viewer.vala:1479
-msgid "Mark Unread From _Here"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:52
-msgid "Mark as S_pam"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:277
-msgid "Mark as _Read"
-msgstr ""
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "عرض اصدار البرنامج"
 
-#: ../../src/client/geary-controller.vala:283
-msgid "Mark as _Unread"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:53
-msgid "Mark as not S_pam"
-msgstr ""
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "فضلا ابلغ عن تعليقات, اقتراحات, او مشاكل لـ:"
 
-#: ../../src/client/geary-controller.vala:55
-#: ../../src/client/geary-controller.vala:269
-msgid "Mark conversation"
-msgstr "تأشير المحادثة"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "فشل في تحليل خيارات سطر الاوامر: %s\n"
 
-#: ../../src/client/geary-controller.vala:56
-msgid "Mark conversations"
-msgstr "تأشير المحادثات"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "خيار سطر الاوامر غير معروف \"%s\"\n"
+
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - رسائل جديدة"
+
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d صفر رسالة جديدة"
+msgstr[1] "%d رسالة جديدة"
+msgstr[2] "%d رسالتان جديدتان"
+msgstr[3] "%d رسائل جديدة"
+msgstr[4] "%d رسائل جديدة"
+msgstr[5] "%d رسائل جديدة"
+
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "فتح"
 
-#: ../../src/client/views/formatted-conversation-data.vala:11
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "انا"
 
-#: ../../ui/composer.glade:158
-msgid "Medium"
-msgstr "الوسط"
-
-#: ../../ui/composer.glade:75
-msgid "More options"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:59
-#: ../../src/client/geary-controller.vala:308
-msgid "Move conversation"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:60
-msgid "Move conversations"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
 
-#: ../../ui/login.glade:176
-msgid "N_ame:"
-msgstr "الاسم:"
-
-#: ../../ui/login.glade:230
-msgid "N_ickname:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "رسالة جديدة"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:80
-msgid "Nickname:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
 msgstr ""
 
-#: ../../ui/login.glade:661
-msgid "No authentication re_quired"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:275
-msgid "No conversations in folder."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:244
-msgid "No conversations selected."
-msgstr "لا توجد محادثات مختارة"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:273
-msgid "No search results found."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:128
-#: ../../src/engine/api/geary-special-folder-type.vala:58
-msgid "None"
-msgstr "لا شئ"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr ""
 
-#: ../../ui/preferences.glade:158
-msgid "Notifications"
-msgstr "التنبيهات"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr ""
 
-#: ../../src/client/util/util-date.vala:164
-msgid "Now"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
 msgstr ""
 
-#. / 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:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
 msgstr ""
 
-#. / 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:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
 msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "فتح"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "اخري"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "اختر ملف"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "الصادر"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_ارفاق"
 
-#: ../../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:10
-msgid "Output debugging information"
-msgstr "معلومات معرفة المشكلة للمخرجات"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "الحسابات"
 
-#: ../../ui/login.glade:337
-msgid "P_ort:"
-msgstr "المنفذ:"
+#. / 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 ""
 
-#: ../../ui/login.glade:474
-msgid "Pass_word:"
-msgstr "كلمة السر:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "مرحبا بكم في Geary"
 
-#: ../../ui/login.glade:101
-msgid "Password"
-msgstr ""
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "ادخل معلومات حسابك لتبدأ"
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "منذ إسبوعين"
 
-#: ../../ui/password-dialog.glade:196
-msgid "Password:"
-msgstr "كلمة السر:"
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "منذ شهر"
 
-#: ../../ui/composer.glade:102
-msgid "Paste _With Formatting"
-msgstr ""
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "منذ 3 اسابيع"
 
-#: ../../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your email password"
-msgstr "فضلا ادخل كلمة السر الخاصة ببريدك الالكتروني"
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "منذ 6 اسابيع"
 
-#: ../../src/client/geary-args.vala:47
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "فضلا ابلغ عن تعليقات, اقتراحات, او مشاكل لـ:"
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "منذ سنة"
 
-#: ../../ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
 msgstr ""
 
-#: ../../ui/login.glade:421
-msgid "Por_t:"
-msgstr "المنفذ:"
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:367 ../../ui/password-dialog.glade:470
-msgid "Port:"
-msgstr "المنفذ:"
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "الكل"
 
-#: ../../ui/composer.glade:81
-msgid "Quote text  (Ctrl+])"
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:322
-msgid "R_eply All"
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
 msgstr ""
 
-#: ../../ui/preferences.glade:55
-msgid "Reading"
-msgstr "قراءة"
-
-#: ../../ui/password-dialog.glade:274
-msgid "Real name:"
-msgstr "الاسم الحقيقي:"
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:590
+#: ../src/client/accounts/add-edit-page.vala:730
 msgid "Remem_ber password"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:583
-msgid "Remem_ber passwords"
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
 msgstr ""
 
-#: ../../ui/account_list.glade:97
-msgid "Remove account"
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
 msgstr ""
 
-#: ../../ui/composer.glade:95
-msgid "Remove formatting (Ctrl+Space)"
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:318
-msgid "Reply (Ctrl+R, R)"
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:323
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1452
-msgid "Reply to _All"
-msgstr "الرد علي الجميع"
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:163
-msgid "SMTP Credentials"
-msgstr "اعتمادات الـSMTP"
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr ""
 
-#: ../../ui/login.glade:507
-msgid "SMTP password"
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
 msgstr ""
 
-#: ../../ui/login.glade:439 ../../ui/password-dialog.glade:437
-msgid "SMTP settings"
-msgstr "اعدادات الـSMTP"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr ""
 
-#: ../../ui/login.glade:491
-msgid "SMTP username"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:124
-msgid "SSL"
+#. / 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 "%l:%M %P"
+
+#. / 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 "%b %-e"
+
+#. / 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 "%B %-e, %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 "%B %-e, %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 "%B %-e, %Y %-l:%M %P"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:382 ../../ui/password-dialog.glade:485
-msgid "SSL/TLS encryption:"
-msgstr "تشفير SSL/TLS:"
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/dialogs/password-dialog.vala:126
-msgid "STARTTLS"
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
 msgstr ""
 
-#: ../../ui/composer.glade:169
-msgid "S_ans Serif"
+#. / 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
+msgid "%A"
 msgstr ""
 
-#: ../../ui/composer.glade:175
-msgid "S_erif"
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "بايتس"
+
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "تيرا بايت"
+
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "جيجا بايت"
+
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "ميجا بايت"
+
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "كيلو بايت"
+
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] ""
+msgstr[1] ""
+
+#. / 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
+msgid "%s, %s"
 msgstr ""
 
-#: ../../ui/login.glade:160
-msgid "S_ervice:"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "صناديق الوارد"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
 msgstr ""
 
-#: ../../ui/composer.glade:170
-msgid "Sans Serif"
-msgstr "Sans Serif"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/views/conversation-viewer.vala:1437
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "صفر مرفق"
-msgstr[1] "حفظ المرفق"
-msgstr[2] "حفظ المرفقات"
-msgstr[3] "حفظ المرفقات"
-msgstr[4] "حفظ المرفقات"
-msgstr[5] "حفظ المرفقات"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "لا توجد محادثات مختارة"
 
-#: ../../src/client/views/conversation-viewer.vala:1400
-msgid "Save All A_ttachments..."
-msgstr "حفظ المرفقات"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/composer/composer-window.vala:41
-msgid "Saved"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:42
-msgid "Saving"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
 msgstr ""
 
-#: ../../ui/login.glade:304
-msgid "Se_rver:"
-msgstr "الخادم:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
+msgstr ""
 
-#: ../../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"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
 msgstr ""
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:39
-#: ../../src/client/ui/main-toolbar.vala:170
-#, c-format
-msgid "Search %s account"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
 msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:76
-msgid "Search all mail in account for keywords (Ctrl+S)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:1243
-msgid "Select Color"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "من:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "الي:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Cc:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "الموضوع:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "التاريخ:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:32
-#: ../../src/client/views/conversation-viewer.vala:916
-msgid "Select _All"
-msgstr "اختيار _الكل"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "_نسخ"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "نسخ عنوان البريد الالكتروني"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "نسخ الرابط"
 
-#: ../../src/client/views/conversation-viewer.vala:910
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:27
-msgid "Send and receive email"
-msgstr "ارسال و استقبال البريد الالكتروني"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "اختيار _الكل"
 
-#: ../../src/client/composer/composer-window.vala:747
-msgid "Send message with an empty body?"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:743
-msgid "Send message with an empty subject and body?"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:745
-msgid "Send message with an empty subject?"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:749
-msgid "Send message without an attachment?"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
 msgstr ""
 
-#. / 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..."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "البريد المرسل"
-
-#: ../../ui/login.glade:404
-msgid "Ser_ver:"
-msgstr "الخادم:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_حفظ باسم"
 
-#: ../../ui/composer.glade:176
-msgid "Serif"
-msgstr "Serif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "حفظ المرفقات"
 
-#: ../../ui/password-dialog.glade:352 ../../ui/password-dialog.glade:455
-msgid "Server:"
-msgstr "الخادم:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] "صفر مرفق"
+msgstr[1] "حفظ المرفق"
+msgstr[2] "حفظ المرفقات"
+msgstr[3] "حفظ المرفقات"
+msgstr[4] "حفظ المرفقات"
+msgstr[5] "حفظ المرفقات"
 
-#: ../../ui/password-dialog.glade:259
-msgid "Service:"
-msgstr "الخدمة:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "الرد علي الجميع"
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "Show Images"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "_علم كمقرؤة"
 
-#: ../../ui/preferences.glade:193
-msgid "Show _notifications for new mail"
-msgstr "عرض _التنبيهات لبريد جديد"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "_علم كغير مقرؤة"
 
-#: ../../ui/composer.glade:164
-msgid "Small"
-msgstr "صغير"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "رسال مزعجة"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "_عرض المصدر"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "متألقة"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "فشلة في محاولة فتح محرر النصوص الافتراضي"
 
-#: ../../ui/login.glade:761
-msgid "Storage"
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
 msgstr ""
 
-#: ../../ui/composer.glade:134
-msgid "Strikethrough (Ctrl+K)"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:617
-msgid "Subject:"
-msgstr "الموضوع:"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
 msgstr ""
 
-#: ../../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "تيرا بايت"
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:1493
-#, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr "الملف موجود بالفعل في  \"%s\". استبداله سوف يعيد كتابة محتوياته"
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "رسالة جديدة"
 
-#: ../../src/client/geary-controller.vala:747
+#: ../src/client/composer/composer-widget.vala:138
 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."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
 
-#: ../../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."
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
 msgstr ""
 
-#: ../../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"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
 msgstr ""
 
-#: ../../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>"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1147
-msgid "This link appears to go to"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "This message contains remote images."
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
 msgstr ""
 
-#: ../../ui/composer.glade:435
-msgid "To add them as attachments"
-msgstr "لاضافتهم كمرفقات"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "لا يمكن اضافة المرفقات"
 
-#: ../../src/client/views/conversation-viewer.vala:608
-msgid "To:"
-msgstr "الي:"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "لا يمكن إيجاد \"%s\"."
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "الي: %s\n"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" هو مجلد"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "سلة المهملات"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" هو ملف خالي."
 
-#: ../../src/client/geary-controller.vala:294
-msgid "U_nstar"
-msgstr "الغاء التميز بنجمة"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "\"%s\" لا يمكن فتحها للقراءة"
 
-#: ../../src/client/dialogs/password-dialog.vala:17
-msgid "Unable to login to email server"
-msgstr "غير قادر علي الاتصال بخادم البريد الالكتروني"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "\"%s\" موجود بالفعل في المرفقات للتوصيل"
 
-#: ../../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"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:701
-#, c-format
-msgid "Unable to open the database for %s"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:713
-#, c-format
-msgid "Unable to rebuild database for \"%s\""
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:619
-msgid "Unable to validate:\n"
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
 msgstr ""
 
-#: ../../ui/composer.glade:127
-msgid "Underline (Ctrl+U)"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
 msgstr ""
 
-#: ../../ui/composer.glade:88
-msgid "Unquote text (Ctrl+[)"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:65
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "خيار سطر الاوامر غير معروف \"%s\"\n"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr ""
 
-#: ../../ui/login.glade:457
-msgid "User_name:"
-msgstr "اسم المستخدم:"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:70 ../../ui/password-dialog.glade:181
-msgid "Username:"
-msgstr "اسم المستخدم:"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr ""
 
-#: ../../src/client/geary-application.vala:19
-msgid "Visit the Yorba web site"
-msgstr "زيارة موقع يوربا الالكتروني"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-#, c-format
-msgid "Welcome to Geary."
-msgstr "مرحبا بكم في Geary"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:252
-msgid "Work, Home, etc."
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
 msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "بريد Yahoo!"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr ""
 
-#: ../../src/client/util/util-date.vala:177
-msgid "Yesterday"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_الغاء"
+
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
 msgstr ""
 
-#: ../../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?"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
 msgstr ""
-"اعداداتك لـIMAP و\\او SMTP لا تحدد SSL او TLS. هذا يعني ان اسم المستخدم و "
-"كلمة السر الخاصة بك قد تقرأ بواسطة شخص اخر علي الشبكة. هل انت متأكدة بانك "
-"تريد الاستمرار؟"
 
-#: ../../src/client/geary-controller.vala:551
-msgid "Your settings are insecure"
-msgstr "اعداداتك غير أمنة"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:258
-#: ../../src/client/ui/stock.vala:21
-msgid "_About"
-msgstr "_عن"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr ""
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:22
-msgid "_Add"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:47
-msgid "_Archive"
-msgstr "_أرشيف"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr ""
 
-#: ../../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_ارفاق"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr ""
 
-#: ../../ui/composer.glade:525
-msgid "_Attach File"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
 msgstr ""
 
-#: ../../ui/preferences.glade:69
-msgid "_Automatically select next message"
-msgstr "_اختار الرسالة التالية تلقائيا"
+#~ msgid "%u conversations selected."
+#~ msgstr "%u المحادثة مختارة."
 
-#: ../../src/client/ui/stock.vala:19
-msgid "_Cancel"
-msgstr "_الغاء"
+#~ msgid "%u read messages"
+#~ msgstr "%u قراءة الرسائل"
 
-#: ../../ui/composer.glade:52
-msgid "_Center"
-msgstr "_وسط"
+#~ msgid "Archive conversation (Delete, Backspace, A)"
+#~ msgstr "المحادثة إلي الإرشيف (Delete, Backspace, A)"
 
-#: ../../src/client/ui/stock.vala:23
-msgid "_Close"
-msgstr ""
+#~ msgid "Archive conversations (Delete, Backspace, A)"
+#~ msgstr "المحادثات إلي الإرشيف (Delete, Backspace, A)"
 
-#: ../../src/client/views/conversation-viewer.vala:889
-msgid "_Copy"
-msgstr "_نسخ"
+#~ msgid "C_olor"
+#~ msgstr "اللون"
 
-#: ../../src/client/geary-controller.vala:42
-msgid "_Delete"
-msgstr "_حذف"
+#~ msgid "Compose Message"
+#~ msgstr "اكتب رسالة جديدة"
 
-#: ../../ui/password-dialog.glade:548
-msgid "_Details"
-msgstr "_التفاصيل"
+#~ msgid "Composer"
+#~ msgstr "الكاتب"
 
-#: ../../src/client/ui/stock.vala:24
-msgid "_Discard"
-msgstr ""
+#~ msgid "Copyright 2011-2013 Yorba Foundation"
+#~ msgstr "جميع الحقوق محفوظة 2011-2013 Yorba Foundation."
 
-#: ../../ui/preferences.glade:90
-msgid "_Display conversation preview"
-msgstr ""
+#~ msgid "Delete conversation (Delete, Backspace, A)"
+#~ msgstr "مسح المحادثة (Delete, Backspace, A)"
 
-#: ../../src/client/geary-controller.vala:262
-msgid "_Donate"
-msgstr ""
+#~ msgid "Delete conversations (Delete, Backspace, A)"
+#~ msgstr "مسح المحادثات (Delete, Backspace, A)"
 
-#: ../../ui/login.glade:782
-msgid "_Download mail:"
-msgstr ""
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "هل تريد تجاهل الرسالة التي لم يتم حفظها؟"
 
-#: ../../ui/composer.glade:181
-msgid "_Fixed Width"
-msgstr ""
+#~ msgid "Drop files here"
+#~ msgstr "اسقاط الملفات هنا"
 
-#: ../../src/client/geary-controller.vala:328
-#: ../../src/client/views/conversation-viewer.vala:1457
-msgid "_Forward"
-msgstr "_اعادة توجيه رسالة"
+#~ msgid "Enable _spell checking"
+#~ msgstr "تمكين _التدقيق الاملائي"
 
-#: ../../src/client/geary-controller.vala:254
-#: ../../src/client/ui/stock.vala:25
-msgid "_Help"
-msgstr "_مساعدة"
+#~ msgid "Encr_yption:"
+#~ msgstr "التشفير:"
 
-#: ../../ui/composer.glade:542
-msgid "_Include Original Attachments"
-msgstr ""
+#~ msgid "Encrypt_ion:"
+#~ msgstr "التشفير:"
 
-#: ../../src/client/views/conversation-viewer.vala:922
-msgid "_Inspect"
-msgstr ""
+#~ msgid "Geary Mail"
+#~ msgstr "بريد Geary"
 
-#: ../../ui/composer.glade:57
-msgid "_Justify"
-msgstr "_احسن توزيع الفسحات"
+#~ msgid "IMAP Credentials"
+#~ msgstr "اعتمادات الـIMAP"
 
-#: ../../src/client/ui/stock.vala:33
-msgid "_Keep"
-msgstr ""
+#~ msgid "IMAP settings"
+#~ msgstr "اعدادات الـIMAP"
 
-#: ../../src/client/geary-controller.vala:305
-msgid "_Label"
-msgstr "_وسم"
+#~ msgid "Large"
+#~ msgstr "كبير"
 
-#: ../../ui/composer.glade:42
-msgid "_Left"
-msgstr "_يسار"
+#~ msgid "Medium"
+#~ msgstr "الوسط"
 
-#: ../../src/client/views/conversation-viewer.vala:1469
-msgid "_Mark as Read"
-msgstr "_علم كمقرؤة"
+#~ msgid "N_ame:"
+#~ msgstr "الاسم:"
 
-#: ../../src/client/views/conversation-viewer.vala:1473
-msgid "_Mark as Unread"
-msgstr "_علم كغير مقرؤة"
+#~ msgid "Notifications"
+#~ msgstr "التنبيهات"
 
-#: ../../src/client/geary-controller.vala:271
-msgid "_Mark as..."
-msgstr "_علم كـ"
+#~ msgid "P_ort:"
+#~ msgstr "المنفذ:"
 
-#: ../../ui/composer.glade:157
-msgid "_Medium"
-msgstr ""
+#~ msgid "Pass_word:"
+#~ msgstr "كلمة السر:"
 
-#: ../../src/client/geary-controller.vala:309
-msgid "_Move"
-msgstr "_انقل"
+#~ msgid "Password:"
+#~ msgstr "كلمة السر:"
 
-#: ../../src/client/ui/stock.vala:18
-msgid "_OK"
-msgstr ""
+#~ msgid "Please enter your email password"
+#~ msgstr "فضلا ادخل كلمة السر الخاصة ببريدك الالكتروني"
 
-#: ../../src/client/ui/stock.vala:26
-msgid "_Open"
-msgstr ""
+#~ msgid "Por_t:"
+#~ msgstr "المنفذ:"
 
-#: ../../ui/login.glade:131 ../../ui/login.glade:539
-#: ../../ui/password-dialog.glade:85
-msgid "_Password:"
-msgstr "_كلمة السر:"
+#~ msgid "Port:"
+#~ msgstr "المنفذ:"
 
-#: ../../ui/composer.glade:35
-msgid "_Paste"
-msgstr ""
+#~ msgid "Reading"
+#~ msgstr "قراءة"
 
-#: ../../ui/preferences.glade:172
-msgid "_Play notification sounds"
-msgstr "_لعب صوت التنبيهات"
+#~ msgid "Real name:"
+#~ msgstr "الاسم الحقيقي:"
 
-#: ../../src/client/geary-controller.vala:250
-#: ../../src/client/ui/stock.vala:27
-msgid "_Preferences"
-msgstr "_التفضيلات"
+#~ msgid "SMTP Credentials"
+#~ msgstr "اعتمادات الـSMTP"
 
-#: ../../src/client/ui/stock.vala:28
-msgid "_Print..."
-msgstr ""
+#~ msgid "SMTP settings"
+#~ msgstr "اعدادات الـSMTP"
 
-#: ../../src/client/geary-controller.vala:266
-#: ../../src/client/ui/stock.vala:29
-msgid "_Quit"
-msgstr "_الخروج"
+#~ msgid "SSL/TLS encryption:"
+#~ msgstr "تشفير SSL/TLS:"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "_Rebuild"
-msgstr ""
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../../ui/composer.glade:14
-msgid "_Redo"
-msgstr ""
+#~ msgid "Se_rver:"
+#~ msgstr "الخادم:"
 
-#: ../../ui/password-dialog.glade:561
-msgid "_Remember passwords"
-msgstr ""
+#~ msgid "Send and receive email"
+#~ msgstr "ارسال و استقبال البريد الالكتروني"
 
-#: ../../src/client/ui/stock.vala:30
-msgid "_Remove"
-msgstr ""
+#~ msgid "Ser_ver:"
+#~ msgstr "الخادم:"
 
-#: ../../src/client/geary-controller.vala:1496
-msgid "_Replace"
-msgstr "_استبدال"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../../src/client/geary-controller.vala:317
-#: ../../src/client/views/conversation-viewer.vala:1447
-msgid "_Reply"
-msgstr "_رد"
+#~ msgid "Server:"
+#~ msgstr "الخادم:"
 
-#: ../../ui/composer.glade:141
-msgid "_Rich Text"
-msgstr ""
+#~ msgid "Service:"
+#~ msgstr "الخدمة:"
 
-#: ../../ui/composer.glade:47
-msgid "_Right"
-msgstr "_يمين"
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "عرض _التنبيهات لبريد جديد"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:31
-msgid "_Save"
-msgstr ""
+#~ msgid "Small"
+#~ msgstr "صغير"
 
-#: ../../src/client/views/conversation-viewer.vala:1395
-msgid "_Save As..."
-msgstr "_حفظ باسم"
+#~ msgid "To add them as attachments"
+#~ msgstr "لاضافتهم كمرفقات"
 
-#: ../../src/client/views/conversation-viewer.vala:1414
-msgid "_Save Image As..."
-msgstr ""
+#~ msgid "Unable to login to email server"
+#~ msgstr "غير قادر علي الاتصال بخادم البريد الالكتروني"
 
-#: ../../ui/composer.glade:594
-msgid "_Send"
-msgstr "_ارسال"
+#~ msgid "User_name:"
+#~ msgstr "اسم المستخدم:"
 
-#: ../../ui/composer.glade:163
-msgid "_Small"
-msgstr ""
+#~ msgid "Username:"
+#~ msgstr "اسم المستخدم:"
 
-#: ../../src/client/geary-controller.vala:289
-msgid "_Star"
-msgstr "_نجمة"
+#~ msgid "_Automatically select next message"
+#~ msgstr "_اختار الرسالة التالية تلقائيا"
 
-#: ../../ui/composer.glade:7
-msgid "_Undo"
-msgstr ""
+#~ msgid "_Center"
+#~ msgstr "_وسط"
 
-#: ../../ui/login.glade:522
-msgid "_Username:"
-msgstr "اسم المستخدم:"
+#~ msgid "_Delete"
+#~ msgstr "_حذف"
 
-#: ../../src/client/views/conversation-viewer.vala:1494
-msgid "_View Source"
-msgstr "_عرض المصدر"
+#~ msgid "_Details"
+#~ msgstr "_التفاصيل"
 
-#. / 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 ""
+#~ msgid "_Justify"
+#~ msgstr "_احسن توزيع الفسحات"
 
-#: ../../src/client/views/conversation-viewer.vala:1148
-msgid "but actually goes to"
-msgstr ""
+#~ msgid "_Left"
+#~ msgstr "_يسار"
 
-#: ../../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "بايتس"
+#~ msgid "_Password:"
+#~ msgstr "_كلمة السر:"
 
-#. / Placeholder filename for attachments with no filename.
-#: ../../src/client/views/conversation-viewer.vala:1799
-#: ../../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "لا شئ"
+#~ msgid "_Play notification sounds"
+#~ msgstr "_لعب صوت التنبيهات"
 
-#: ../../src/client/views/conversation-find-bar.vala:226
-msgid "not found"
-msgstr ""
+#~ msgid "_Right"
+#~ msgstr "_يمين"
 
-#. / 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 "المترجم"
+#~ msgid "_Send"
+#~ msgstr "_ارسال"
+
+#~ msgid "_Username:"
+#~ msgstr "اسم المستخدم:"
diff --git a/po/bs.po b/po/bs.po
index c987dc9..3b4113c 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,441 +6,430 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bosnianuniversetranslation\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-02-27 05:58+0000\n"
-"PO-Revision-Date: 2015-03-03 20:57+0100\n"
-"Last-Translator: Samir Ribic <samir ribic etf unsa ba>\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 00:57+0000\n"
+"Last-Translator: Samir Ribić <Unknown>\n"
 "Language-Team: Bosnian <bs li org>\n"
-"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Poedit 1.7.4\n"
-"X-Launchpad-Export-Date: 2015-02-15 06:28+0000\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Mail klijent"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary Mail"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Šaljite i primajte e-poštu"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Epošta;E-pošta;pošta;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Sastavi poruku"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Poslano e-poštom"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:53+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: bs\n"
 
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Šalji datoteke koristeći Geary"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Skice | Skica"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Snimi"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr "Poslano | Poslana pošta | Poslana Epošta | Poslana e-pošta"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Dodaj"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
+"Smeće | Spam | Smeće pošta | Smeće Epošta | Smeće E-pošta | Rasuta pošta | "
+"Rasuta Epošta | Rasuta E-pošta"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:20
-msgid "Accounts"
-msgstr "Korisnički računi"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Smeće | Otpad | Kanta za otpad"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  Seje the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / Placeholder text indicating that the user should type their first nami and last nami
-#: ../src/client/accounts/add-edit-page.vala:10
-msgid "First Last"
-msgstr "Prvi Posljednji"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:230
-msgid "Welcome to Geary."
-msgstr "Dobrodošli u Geary."
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Dolazna pošta"
 
-#: ../src/client/accounts/add-edit-page.vala:230
-msgid "Enter your account information to get started."
-msgstr "Unesite informacije o korisničkom računu za početak."
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Skice"
 
-#: ../src/client/accounts/add-edit-page.vala:249
-msgid "2 weeks back"
-msgstr "2 sedmice unazad"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Poslana pošta"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:250
-msgid "1 month back"
-msgstr "1 mjesec unazad"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Sa zvjezdicom"
 
-#: ../src/client/accounts/add-edit-page.vala:251
-msgid "3 months back"
-msgstr "3 mjeseca unazad"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Važno"
 
-#: ../src/client/accounts/add-edit-page.vala:252
-msgid "6 months back"
-msgstr "6 mjeseci unazad"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Sva pošta"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "1 year back"
-msgstr "1 godina unazad"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Spam"
 
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "2 years back"
-msgstr "2 godine unazad"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Smeće"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "4 years back"
-msgstr "4 godine unazad"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Odlazno sanduče"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "Everything"
-msgstr "Sve"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Traži"
 
-#: ../src/client/accounts/add-edit-page.vala:276
-msgid "Edit"
-msgstr "Izmijeni"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Arhiva"
 
-#: ../src/client/accounts/add-edit-page.vala:278
-msgid "Preview"
-msgstr "Pregled"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Ništa"
 
-#: ../src/client/accounts/add-edit-page.vala:712
-msgid "Remem_ber passwords"
-msgstr "Pa_mti lozinke"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:719 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "Pa_mti lozinku"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:753
-msgid "Unable to validate:\n"
-msgstr "Neuspješna validacija:\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:755
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Nadimak korisničkog računa nije dozvoljen..\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:758
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; Adresa e-pošte je već dodana u Geary.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:762
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP greška veze.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Ostalo"
 
-#: ../src/client/accounts/add-edit-page.vala:765
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; IMAP korisničko ime ili lozinka nisu tačni.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "prilog"
 
-#: ../src/client/accounts/add-edit-page.vala:768
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP greška veze.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "bcc"
 
-#: ../src/client/accounts/add-edit-page.vala:771
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; SMTP korisničko ime ili lozinka nije tačna.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "tijelo"
 
-#: ../src/client/accounts/add-edit-page.vala:775
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Greška veze.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "cc"
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Korisničko ime ili lozinka nije tačna.\n"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "od"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Zaštita autorskog prava 2011-2015 Yorba Foundation"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "tema"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Posjeti Yorba internet stranicu"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "za"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Započni Geary sa skrivenim glavnim prozorom"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "ja"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Informacije debugging izlaza"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(bez predmeta)"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Prijavite monitoring razgovora"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %b %-e, %Y at %-l:%M %p"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Prijavite deserijalizaciju mreže"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "Na %1$s, %2$s je napisao/la:"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Prijavite aktivnosti mreže"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s je napisao/la:"
 
-#. / The IMAP replay queue is how changes on the server are replicated on the client.
-#. / It could also bje called the IMAP events queue.
-#: ../src/client/application/geary-args.vala:17
-msgid "Log IMAP replay queue"
-msgstr "Prijavite IMAP replay red"
+#. / 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:234
+msgid "On %s:"
+msgstr "Na %s:"
 
-#. / 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 "Prijavite serijalizaciju mreže"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Prosljeđena poruka ----------"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Prijavite periodične aktivnosti"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Od: %s\n"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Prijavite redove baze podataka (generisaće puno poruka)"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Predmet: %s\n"
 
-#. / "Normalization" can also bje called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Prijavite normalizaciju direktorija"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Datum: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Dozvolite inspekciju WebView-a"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Za: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Opozovi sve certifikate servera sa TSL upozorenjima"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Cc: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Prikaži verziju programa"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "nema"
 
-#. This gives a command-line hint on how to opijen new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Koristite %s da bi ste otvorili novi prozor za sastavljanje"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Mail klijent"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Molimo vas da ostavite komentar, sugestiju ili prijavite bug na:"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "Zaštita autorskog prava 2011-2015 Yorba Foundation"
 
-#. i18n: Command linije arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Analiza opcija komandne linije nije uspjela: %s\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Posjeti Yorba internet stranicu"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Opcija komandne linije nije prepoznata  \"%s\"\n"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:60
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Izbriši konverzaciju (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:61
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Izbriši konverzacije (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:65
+#: ../src/client/application/geary-controller.vala:67
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Prebaci konverzaciju u smeće (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:66
+#: ../src/client/application/geary-controller.vala:68
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "Prebaci konverzacije u smeće (Delete, Backspace)"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:70
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Arhiva"
 
-#: ../src/client/application/geary-controller.vala:71
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Arhiviraj konverzaciju (A)"
 
-#: ../src/client/application/geary-controller.vala:72
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Arhiviraj konverzacije (A)"
 
-#: ../src/client/application/geary-controller.vala:75
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Označi kao S_pam"
 
-#: ../src/client/application/geary-controller.vala:76
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Označi kao da nije S_pam"
 
-#: ../src/client/application/geary-controller.vala:78
-#: ../src/client/application/geary-controller.vala:348
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Označi konverzaciju"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Označi konverzacije"
 
-#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Dodaj oznaku konverzacije"
 
-#: ../src/client/application/geary-controller.vala:81
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Dodaj oznaku konverzacija"
 
-#: ../src/client/application/geary-controller.vala:82
-#: ../src/client/application/geary-controller.vala:387
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Pomjeri konverzaciju"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Pomjeri konverzacije"
 
-#: ../src/client/application/geary-controller.vala:324
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "Korisnički r_ačuni"
 
-#: ../src/client/application/geary-controller.vala:329
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Podešavanja"
 
-#: ../src/client/application/geary-controller.vala:333
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: ../src/client/application/geary-controller.vala:337
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/client/application/geary-controller.vala:341
-msgid "_Donate"
-msgstr "_Donirajte"
-
-#: ../src/client/application/geary-controller.vala:345
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Izađi"
 
-#: ../src/client/application/geary-controller.vala:350
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Označi kao..."
 
-#: ../src/client/application/geary-controller.vala:356
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Označi kao _pročitano"
 
-#: ../src/client/application/geary-controller.vala:362
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Označi kao _nepročitano"
 
-#: ../src/client/application/geary-controller.vala:368
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Dodaj zvijezdu"
 
-#: ../src/client/application/geary-controller.vala:373
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "U_kloni zvijezdu"
 
-#: ../src/client/application/geary-controller.vala:383
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Dodaj oznaku"
 
-#: ../src/client/application/geary-controller.vala:384
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Oznaka"
 
-#: ../src/client/application/geary-controller.vala:388
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Premjesti"
 
-#: ../src/client/application/geary-controller.vala:392
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Stvori novu poruku (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:396
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Odgovori"
 
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Odgovori (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:401
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "O_dgovori svima"
 
-#: ../src/client/application/geary-controller.vala:402
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Odgovori svima (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:407
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Proslijedi"
 
-#: ../src/client/application/geary-controller.vala:408
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Proslijedi (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr "Isprazni"
 
-#: ../src/client/application/geary-controller.vala:447
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr "Prazni fascikle sa smećem ili spamom"
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr "Isprazni_spamom"
 
-#: ../src/client/application/geary-controller.vala:455
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr "Isprazni s_meće"
 
-#: ../src/client/application/geary-controller.vala:693
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "NIje moguće pohraniti izuzetak povjerenja prema serveru"
 
-#: ../src/client/application/geary-controller.vala:930
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Vaše postavke nisu sigurne"
 
-#: ../src/client/application/geary-controller.vala:931
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -450,17 +439,17 @@ msgstr ""
 "korisničko ime i lozinka mogu biti pročitani od strane druge osobe na mreži. "
 "Želite li ovo da uradite?"
 
-#: ../src/client/application/geary-controller.vala:932
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "Nas_tavi"
 
-#. / Displayed in the space-limited status bar when a message fails to bje sent due to error.
-#: ../src/client/application/geary-controller.vala:1010
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Greška u slanju e-pošte"
 
-#: ../src/client/application/geary-controller.vala:1011
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -468,14 +457,12 @@ msgstr ""
 "Geary je naišao na grešku prilikom slanja e-pošte. Ako se problem i dalje "
 "postoji, molm da ručno izbrišete e-poštu iz vašeg Outbox direktorija."
 
-#. Displayed in the space-limited status bar when a message fails to bje uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1015
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Greška prilikom snimanja poslane e-pošte"
 
-#: ../src/client/application/geary-controller.vala:1016
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -483,20 +470,15 @@ msgstr ""
 "Geary je naišao na grešku prilikom snimanja poslane poruke u Poslane Poruke. "
 "Ova poruka će ostati u vašem Outbox direktoriju dok je ne izbrišete."
 
-#: ../src/client/application/geary-controller.vala:1085
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Oznake"
 
-#. give the user two options: reset the Account local storije, or exit Geary.  A third
-#. could bje donje to leave the Account in an unopened stati, but we don't currently
-#. have provisions for that.
-#: ../src/client/application/geary-controller.vala:1097
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Otvaranje baze podataka onemogućeno za %s"
 
-#: ../src/client/application/geary-controller.vala:1098
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -520,21 +502,19 @@ msgstr ""
 "Obnavljanje baze podataka će uništiti svu lokalnu e-poštu i privitke.  <b>To "
 "neće utjecati na poštu na vašem serveru.</b>"
 
-#: ../src/client/application/geary-controller.vala:1100
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "_Obnovi"
 
-#: ../src/client/application/geary-controller.vala:1100
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "I_zlaz"
 
-#: ../src/client/application/geary-controller.vala:1109
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Nije noguće obnoviti bazu podataka za \"%s\""
 
-#: ../src/client/application/geary-controller.vala:1110
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -544,17 +524,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened stati, so have to exit
-#: ../src/client/application/geary-controller.vala:1132
-#: ../src/client/application/geary-controller.vala:1142
-#: ../src/client/application/geary-controller.vala:1153
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "NIje moguće otvoriti lokalno poštansko sanduče za %s"
 
-#: ../src/client/application/geary-controller.vala:1133
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -572,7 +548,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1143
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -586,7 +562,7 @@ msgstr ""
 "\n"
 "Molimo instalirajte posljednju verziju Geary-a i pokušajte ponovo."
 
-#: ../src/client/application/geary-controller.vala:1154
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -598,29 +574,30 @@ msgstr ""
 "\n"
 "Molim da provjerite vašu konekciju i da restartujete Geary."
 
-#: ../src/client/application/geary-controller.vala:1662
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "O programu %s"
 
-#. / Translators: add your nami and email address to receive credit in the About dialog
+#. / 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-controller.vala:1665
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
 msgstr ""
-"   Mirza Krajina https://launchpad.net/~krajina\n";
-"  Samir Ribić https://launchpad.net/~megaribi";
+"Mirza Krajina https://launchpad.net/~krajina\n";
+"  Samir Ribić https://launchpad.net/~megaribi\n";
+"\n"
+"Launchpad Contributions:\n"
+"  Samir Ribić https://launchpad.net/~samir-ribic";
 
-#: ../src/client/application/geary-controller.vala:1931
+#: ../src/client/application/geary-controller.vala:1976
 msgid "Undo move (Ctrl+Z)"
 msgstr "Poništi pomijeranje (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:1941
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Da li ste sigurnu da želite otvoriti \"%s\"?"
 
-#: ../src/client/application/geary-controller.vala:1942
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -628,303 +605,541 @@ msgstr ""
 "Privici mogu izazvati štetu na vašem sistemu ako se otvore. Otvarajte "
 "datoteke samo iz pouzdanih izvora."
 
-#: ../src/client/application/geary-controller.vala:1943
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Ne _pitaj me ponovo"
 
-#: ../src/client/application/geary-controller.vala:1961
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Datoteka nazvana „%s“ već postoji.  Želite li da je zamijenite?"
 
-#: ../src/client/application/geary-controller.vala:1963
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "Datoteka već postoji u „%s“.  Njenom zamjenom ćete presnimiti njen sadržaj."
 
-#: ../src/client/application/geary-controller.vala:1966
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Zamijeni"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2264
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Zatvori otvorene draft poruke?"
 
-#: ../src/client/application/geary-controller.vala:2394
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr "Isprazniti svu elektronsku poštu iz vaše %s fascikle?"
 
-#: ../src/client/application/geary-controller.vala:2395
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr ""
 "Ovo uklanja elektronsku pošto iz Geary i vađeg servera za elektronsku poštu"
 
-#: ../src/client/application/geary-controller.vala:2396
+#: ../src/client/application/geary-controller.vala:2441
 msgid "This cannot be undone."
 msgstr "Ovo ne možete poništiti."
 
-#: ../src/client/application/geary-controller.vala:2397
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr "Isprazni %s"
 
-#: ../src/client/application/geary-controller.vala:2414
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 msgid "Error emptying %s"
 msgstr "Greška prilikom pražnjenja %s"
 
 #         translations.
-#: ../src/client/application/geary-controller.vala:2444
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Da li želite da trajno obrišete poruku?"
 msgstr[1] "Da li želite da trajno obrišete poruke?"
 msgstr[2] "Da li želite da trajno obrišete poruke?"
 
-#: ../src/client/application/geary-controller.vala:2446
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ../src/client/application/geary-controller.vala:2477
+#: ../src/client/application/geary-controller.vala:2522
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Poništi arhiviranje (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2492
+#: ../src/client/application/geary-controller.vala:2537
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Poništi smeće (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2545
+#: ../src/client/application/geary-controller.vala:2590
 msgid "Undo (Ctrl+Z)"
 msgstr "Poništi (Ctrl+Z)"
 
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Započni Geary sa skrivenim glavnim prozorom"
+
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Informacije debugging izlaza"
+
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Prijavite monitoring razgovora"
+
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Prijavite deserijalizaciju mreže"
+
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Prijavite aktivnosti mreže"
+
+#. / 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 "Prijavite IMAP replay red"
+
+#. / 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 "Prijavite serijalizaciju mreže"
+
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Prijavite periodične aktivnosti"
+
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Prijavite redove baze podataka (generisaće puno poruka)"
+
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Prijavite normalizaciju direktorija"
+
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Dozvolite inspekciju WebView-a"
+
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Opozovi sve certifikate servera sa TSL upozorenjima"
+
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Prikaži verziju programa"
+
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Koristite %s da bi ste otvorili novi prozor za sastavljanje"
+
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Molimo vas da ostavite komentar, sugestiju ili prijavite bug na:"
+
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Analiza opcija komandne linije nije uspjela: %s\n"
+
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Opcija komandne linije nije prepoznata  \"%s\"\n"
+
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Novih poruka"
+
 #         translations.
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i slaganje"
-msgstr[1] "%i slaganja"
-msgstr[2] "%i slaganja"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d nova poruka"
+msgstr[1] "%d nove poruke"
+msgstr[2] "%d novih poruka"
 
 #         translations.
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i slaganje (obavijeno)"
-msgstr[1] "%i slaganja (obavijeno)"
-msgstr[2] "%i slaganja (obavijeno)"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d nova poruka ukupno"
+msgstr[1] "%s, %d nove poruke ukupno"
+msgstr[2] "%s, %d novih poruka ukupno"
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "nije nađeno"
+#         translations.
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d druga nova poruka za %s)"
+msgstr[1] ""
+"%s\n"
+"(%d druge nove poruke za %s)"
+msgstr[2] ""
+"%s\n"
+"(%d druge nove poruke za %s)"
 
-#: ../src/client/components/main-toolbar.vala:11
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Traži"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Otvori"
 
-#. Search bar.
-#: ../src/client/components/main-toolbar.vala:81
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Traži ključne riječi u svim porukama korisničkog računa (Ctrl+S)"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Ja"
 
-#: ../src/client/components/main-toolbar.vala:200
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indeksiranje %s korisničkog računa"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr "Nesigurna konakcija: %s"
 
-#: ../src/client/components/main-toolbar.vala:211
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Pretraži %s korisnički račun"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr "Identitet %s mail servera na %s:%une može biti verifikovan."
 
-#: ../src/client/components/main-window.vala:349
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr ""
+"Označavanje \"Povjerljiv server\" ili \"Uvijek povjerljiv server\" može "
+"uzrokovati da se vaše korisničko ime i lozinka prenose nesigurno."
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Šaljem..."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"Označavanjem \"Ovaj server nije povjerljiv\" će uzrokovati da Geary ne "
+"pristupa ovom serveru."
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_U redu"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Geary neće dodati ili ažururati ovaj korisnički račun e-pošte."
 
-#: ../src/client/components/stock.vala:19 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Otkaži"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"Označavanjem \"Ovaj server nije povjerljiv\" će uzrokovati da Geary prestane "
+"pristupati ovom korisničkom računu."
 
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Zatvori"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
+"Geary će izaći, ukoliko nemate drugih otvorenih korisničkoh računa e-pošte."
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Odbaci"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Kontaktirajte vašeg administratora sistema ili davatelja usluga e-pošte "
+"ukoliko imate bilo kakvo pitanje u vezi ovih problema."
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Otvori"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr "Certifikat servera nije potpisan od strane poznatog organa"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Štampaj..."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr "Identitet servera ne odgovara identitetu navedenom u certifikatu"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Ukloni"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Certifikat servera je istekao"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "Označi _sve"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "Certifikat servera nije aktiviran"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Zadrži"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "Certifikat servera je opozvan i sada nije važeći"
 
-#: ../src/client/composer/composer-widget.vala:59
-msgid "Saved"
-msgstr "Snimljeno"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "Certifikat servera se smatra nesigurnim"
 
-#: ../src/client/composer/composer-widget.vala:60
-msgid "Saving"
-msgstr "Snimanje"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr "Došlo je do greške prilikom obrade certifikata servera"
 
-#: ../src/client/composer/composer-widget.vala:61
-msgid "Error saving"
-msgstr "Greška prilikom snimanja"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr "Zupčinko zahtjeva vašu lozinku el. pošte da bi nastavio"
 
-#: ../src/client/composer/composer-widget.vala:62
-msgid "Press Backspace to delete quote"
-msgstr "Pritisni Backspace za brisanje navodnika"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Izaberite datoteku"
 
-#. A list of keywords, separated by pipe ("|") characters, that suggest an attachment; sinci
-#. this is full-word checking, include all variants of each word.  No spaces are allowed.
-#: ../src/client/composer/composer-widget.vala:123
-msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Prikači"
+
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
 msgstr ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
 
-#: ../src/client/composer/composer-widget.vala:1048
-#: ../src/client/composer/composer-widget.vala:1052
-msgid "Do you want to discard this message?"
-msgstr "Da li želite da odbacite ovu poruku?"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Korisnički računi"
 
-#: ../src/client/composer/composer-widget.vala:1185
-msgid "Send message with an empty subject and body?"
-msgstr "Slati poruku sa praznim naslovom i tijelom?"
+#. / 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 "Prvi Posljednji"
 
-#: ../src/client/composer/composer-widget.vala:1187
-msgid "Send message with an empty subject?"
-msgstr "Slati poruku sa praznim naslovom?"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Dobrodošli u Geary."
 
-#: ../src/client/composer/composer-widget.vala:1189
-msgid "Send message with an empty body?"
-msgstr "Slati poruku sa praznim tijelom?"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Unesite informacije o korisničkom računu za početak."
 
-#: ../src/client/composer/composer-widget.vala:1191
-msgid "Send message without an attachment?"
-msgstr "Slati poruku bez privitka?"
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 sedmice unazad"
 
-#: ../src/client/composer/composer-widget.vala:1453
-msgid "Cannot add attachment"
-msgstr "Ne možete dodati privitak"
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 mjesec unazad"
 
-#: ../src/client/composer/composer-widget.vala:1464
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "\"%s\" se ne može naći."
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 mjeseca unazad"
 
-#: ../src/client/composer/composer-widget.vala:1471
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" je direktorij."
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 mjeseci unazad"
 
-#: ../src/client/composer/composer-widget.vala:1478
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" je prazana datoteka."
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 godina unazad"
 
-#: ../src/client/composer/composer-widget.vala:1492
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "\"%s\" ne može biti otvoren za čitanje."
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "2 godine unazad"
 
-#: ../src/client/composer/composer-widget.vala:1499
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" je već u prilogu za isporuku."
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "4 godine unazad"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1508
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Sve"
 
-#: ../src/client/composer/composer-widget.vala:1568
-msgid "To: "
-msgstr "Za: "
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "Izmijeni"
 
-#: ../src/client/composer/composer-widget.vala:1571
-msgid "Cc: "
-msgstr "Cc: "
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr "Pregled"
 
-#: ../src/client/composer/composer-widget.vala:1574
-msgid "Bcc: "
-msgstr "Bcc: "
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "Pa_mti lozinke"
 
-#: ../src/client/composer/composer-widget.vala:1577
-msgid "Reply-To: "
-msgstr "Odgovori: "
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "Pa_mti lozinku"
 
-#: ../src/client/composer/composer-widget.vala:1810
-msgid "Select Color"
-msgstr "Izbor boje"
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Neuspješna validacija:\n"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2256
-msgid "_From:"
-msgstr "_Od:"
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Nadimak korisničkog računa nije dozvoljen..\n"
 
-#. For other types of messages, just show the from account.
-#. Composer label (without mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2272
-#: ../src/client/conversation-viewer/conversation-viewer.vala:809
-msgid "From:"
-msgstr "Od:"
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Adresa e-pošte je već dodana u Geary.\n"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  Seje the COPYING file in this distribution.
-#.
-#. Window for sending messages.
-#: ../src/client/composer/composer-window.vala:10
-msgid "New Message"
-msgstr "Nova poruka"
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; IMAP greška veze.\n"
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Ja"
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; IMAP korisničko ime ili lozinka nisu tačni.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; SMTP greška veze.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; SMTP korisničko ime ili lozinka nije tačna.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Greška veze.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Korisničko ime ili lozinka nije tačna.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Snimi"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Dodaj"
+
+#. / 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 "%l:%M %P"
+
+#. / 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 "%b %-e"
+
+#. / 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 "%B %-e, %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 "%B %-e, %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 "%B %-e, %Y %-l:%M %P"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Sad"
+
+#         translations.
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "prije %dm"
+msgstr[1] "prije %dm"
+msgstr[2] "prije %dm"
+
+#         translations.
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "prije %dh"
+msgstr[1] "prije %dh"
+msgstr[2] "prije %dh"
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Jučer"
+
+#. / 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
+msgid "%A"
+msgstr "%A"
+
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "bajtova"
+
+#: ../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"
+
+#         translations.
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d poruka"
+msgstr[1] "%d poruke"
+msgstr[2] "%d poruka"
+
+#         translations.
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d nepročitana"
+msgstr[1] "%d nepročitane"
+msgstr[2] "%d nepročitanih"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Ulazni pretinci"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Pretraži %s korisnički račun"
+
+#         translations.
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d rezultat"
+msgstr[1] "%d rezultata"
+msgstr[2] "%d rezultata"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
@@ -932,7 +1147,6 @@ msgstr "Nema odabranih konverzacija."
 
 #         translations.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "%u konverzacija odabrana."
@@ -963,6 +1177,10 @@ msgstr "Uvijek prikaži od pošiljaoca"
 msgid "Edit Draft"
 msgstr "Izmijeni skicu"
 
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "Od:"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:812
 msgid "To:"
 msgstr "Za:"
@@ -985,7 +1203,6 @@ msgstr "Datum:"
 
 #         translations.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "%u pročitana poruka"
@@ -993,33 +1210,30 @@ msgstr[1] "%u pročitane poruke"
 msgstr[2] "%u pročitanih poruka"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr "Poruka je uspješno poslana, ali ne može biti snimljena u %s."
 
-#. Add a mijenu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#. Add a mijenu item for copying the address.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "Kopiraj adresu _e-pošte"
 
-#. Add a mijenu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Kopiraj _vezu"
 
-#. Select message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "Označi _poruku"
 
-#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Označi _sve"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "_Isptaj"
@@ -1032,7 +1246,6 @@ msgstr "Čini se da ova veza ide na"
 msgid "but actually goes to"
 msgstr "ali zapravo ide na"
 
-#. If href doesn't look liki a URL, something is fishy, so warn the user
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
 msgstr " (Nevažeći?)"
@@ -1057,12 +1270,10 @@ msgstr[0] "Snimi _Prilog..."
 msgstr[1] "Snimi sve _Priloge..."
 msgstr[2] "Snimi sve _Priloge..."
 
-#. Reply to all on a message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "Odgovori _svima"
 
-#. Mark as read/unread.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "_Označi kao pročitano"
@@ -1075,1014 +1286,573 @@ msgstr "_Označi kao nepročitano"
 msgid "Mark Unread From _Here"
 msgstr "Označi nepročitane _odavde"
 
-#. Separator.
-#. View original message source.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "_Pogledaj izvor"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:384
-msgid "none"
-msgstr "nema"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "Otvaranje zadanog uredživača teksta nije uspjelo."
 
 #: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s - Inspektor razgovora"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Izaberite datoteku"
-
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Prikači"
-
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
-msgid "Untrusted Connection: %s"
-msgstr "Nesigurna konakcija: %s"
-
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
-msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr "Identitet %s mail servera na %s:%une može biti verifikovan."
-
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
-msgid ""
-"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-"your username and password to be transmitted insecurely."
-msgstr ""
-"Označavanje \"Povjerljiv server\" ili \"Uvijek povjerljiv server\" može "
-"uzrokovati da se vaše korisničko ime i lozinka prenose nesigurno."
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Snimljeno"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-"server."
-msgstr ""
-"Označavanjem \"Ovaj server nije povjerljiv\" će uzrokovati da Geary ne "
-"pristupa ovom serveru."
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Snimanje"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
-msgid "Geary will not add or update this email account."
-msgstr "Geary neće dodati ili ažururati ovaj korisnički račun e-pošte."
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Greška prilikom snimanja"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-"this account."
-msgstr ""
-"Označavanjem \"Ovaj server nije povjerljiv\" će uzrokovati da Geary prestane "
-"pristupati ovom korisničkom računu."
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "Pritisni Backspace za brisanje navodnika"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr ""
-"Geary će izaći, ukoliko nemate drugih otvorenih korisničkoh računa e-pošte."
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Nova poruka"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Contact your system administrator or email service provider if you have any "
-"question about these issues."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Kontaktirajte vašeg administratora sistema ili davatelja usluga e-pošte "
-"ukoliko imate bilo kakvo pitanje u vezi ovih problema."
-
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
-msgstr "Certifikat servera nije potpisan od strane poznatog organa"
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
-msgid "The server's identity does not match the identity in the certificate"
-msgstr "Identitet servera ne odgovara identitetu navedenom u certifikatu"
-
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
-msgid "The server's certificate has expired"
-msgstr "Certifikat servera je istekao"
-
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
-msgid "The server's certificate has not been activated"
-msgstr "Certifikat servera nije aktiviran"
-
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
-msgid "The server's certificate has been revoked and is now invalid"
-msgstr "Certifikat servera je opozvan i sada nije važeći"
-
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
-msgid "The server's certificate is considered insecure"
-msgstr "Certifikat servera se smatra nesigurnim"
-
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
-msgid "An error has occurred processing the server's certificate"
-msgstr "Došlo je do greške prilikom obrade certifikata servera"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Da li želite da odbacite ovu poruku?"
 
-#. 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. Seje this bug report for
-#. details: https://bugzilla.gnome.org/show_bug.cgi?id=679006
-#: ../src/client/dialogs/password-dialog.vala:16
-msgid "Geary requires your email password to continue"
-msgstr "Zupčinko zahtjeva vašu lozinku el. pošte da bi nastavio"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Slati poruku sa praznim naslovom i tijelom?"
 
-#         translations.
-#. 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 poruka"
-msgstr[1] "%d poruke"
-msgstr[2] "%d poruka"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Slati poruku sa praznim naslovom?"
 
-#         translations.
-#. / 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 nepročitana"
-msgstr[1] "%d nepročitane"
-msgstr[2] "%d nepročitanih"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Slati poruku sa praznim tijelom?"
 
-#. / This string represents the divider between two messages: "n messages" and "n unread",
-#. / shown in the folder list as a tooltip.  Please usi 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/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Slati poruku bez privitka?"
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Ulazni pretinci"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Ne možete dodati privitak"
 
-#         translations.
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d rezultat"
-msgstr[1] "%d rezultata"
-msgstr[2] "%d rezultata"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "\"%s\" se ne može naći."
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Novih poruka"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" je direktorij."
 
-#         translations.
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d nova poruka"
-msgstr[1] "%d nove poruke"
-msgstr[2] "%d novih poruka"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" je prazana datoteka."
 
-#         translations.
-#: ../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 nova poruka ukupno"
-msgstr[1] "%s, %d nove poruke ukupno"
-msgstr[2] "%s, %d novih poruka ukupno"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "\"%s\" ne može biti otvoren za čitanje."
 
-#         translations.
-#: ../src/client/notification/libnotify.vala:107
-#, 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 druga nova poruka za %s)"
-msgstr[1] ""
-"%s\n"
-"(%d druge nove poruke za %s)"
-msgstr[2] ""
-"%s\n"
-"(%d druge nove poruke za %s)"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "\"%s\" je već u prilogu za isporuku."
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Otvori"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. / Datetime format for 12-hour time, i.e. 8:31 am
-#. / Seje 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"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Za: "
 
-#. / Datetime format for 24-hour time, i.e. 16:35
-#. / Seje 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"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Cc: "
 
-#. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
-#. / Seje 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"
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Bcc: "
 
-#. / Date format for dates within the current year, i.e. Nov 8
-#. / Seje 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 "%b %-e"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "Odgovori: "
 
-#. / Date format for dates within a different year, i.e. 02/04/10
-#. / Seje 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"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Izbor boje"
 
-#. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
-#. / Seje 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 "%B %-e, %Y %-l:%M %P"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr ""
 
-#. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
-#. / Seje 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"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_Od:"
 
-#. / Verbose datetime format for the locale default (full month, day and time)
-#. / Seje 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 "%B %-e, %Y %-l:%M %P"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Sad"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Šaljem..."
 
 #         translations.
-#: ../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "prije %dm"
-msgstr[1] "prije %dm"
-msgstr[2] "prije %dm"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i slaganje"
+msgstr[1] "%i slaganja"
+msgstr[2] "%i slaganja"
 
 #         translations.
-#: ../src/client/util/util-date.vala:171
-#, c-format
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "prije %dh"
-msgstr[1] "prije %dh"
-msgstr[2] "prije %dh"
-
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "Jučer"
-
-#. / Date format that shows the weekday (Monday, Tuesday, ...)
-#. / Seje 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:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(bez predmeta)"
-
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "bajtova"
-
-#: ../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/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i slaganje (obavijeno)"
+msgstr[1] "%i slaganja (obavijeno)"
+msgstr[2] "%i slaganja (obavijeno)"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "nije nađeno"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_U redu"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Otkaži"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Zatvori"
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Odbaci"
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Ostalo"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Otvori"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Štampaj..."
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Ukloni"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Dolazna pošta"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Zadrži"
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Skice"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Traži ključne riječi u svim porukama korisničkog računa (Ctrl+S)"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Poslana pošta"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Indeksiranje %s korisničkog računa"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Sa zvjezdicom"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Važno"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary Mail"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Sva pošta"
+#~ msgid "Send and receive email"
+#~ msgstr "Šaljite i primajte e-poštu"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Spam"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Epošta;E-pošta;pošta;"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Smeće"
+#~ msgid "Compose Message"
+#~ msgstr "Sastavi poruku"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Odlazno sanduče"
+#~ msgid "Send by email"
+#~ msgstr "Poslano e-poštom"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Arhiva"
+#~ msgid "Send files using Geary"
+#~ msgstr "Šalji datoteke koristeći Geary"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:25
-msgid "None"
-msgstr "Ništa"
+#~ msgid "_Donate"
+#~ msgstr "_Donirajte"
 
-#. Map of user-supplied search field names to column names.
-#. / Can bje typed in the search box liki attachment:file.txt to find
-#. / messages with attachments with a particular nami.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-msgid "attachment"
-msgstr "prilog"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Korisnički račun se ne može "
+#~ "ukloniti</span> "
 
-#. / Can bje typed in the search box liki bcc:johndoe example com to find
-#. / messages bcc'd to a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#. Fields we allow the token to bje "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
-msgstr "bcc"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Prozor za stvaranje koji je povezan sa ovim korisničkim računom je trenutno "
+#~ "otvoren. Pošaljite ili odbacite poruku i pokušajte ponovo."
 
-#. / Can bje typed in the search box liki body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
-msgstr "tijelo"
+#~ msgid "Add account"
+#~ msgstr "Dodaj korisnički račun"
 
-#. / Can bje typed in the search box liki cc:johndoe example com to find
-#. / messages cc'd to a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "cc"
-msgstr "cc"
+#~ msgid "Edit account"
+#~ msgstr "Izmjeni korisnički račun"
 
-#. / Can bje typed in the search box liki from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
-msgstr "od"
+#~ msgid "Remove account"
+#~ msgstr "Ukloni korisnički račun"
 
-#. / Can bje typed in the search box liki subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-msgid "subject"
-msgstr "tema"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Molim sačekajte dok Geary ne potvrdi vaš korisnički račun."
 
-#. / Can bje typed in the search box liki to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
-msgstr "za"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Nepovjerljiva konekcija"
 
-#. "me" can bje typed liki from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
-msgstr "ja"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "_Uvijek vjeruj ovom serveru"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will bje the default, so please add the most common localized nami to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-msgid "Drafts | Draft"
-msgstr "Skice | Skica"
+#~ msgid "_Trust This Server"
+#~ msgstr "_Vjeruj ovom serveru"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will bje the default, so please add the most common localized nami to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "Poslano | Poslana pošta | Poslana Epošta | Poslana e-pošta"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "_Ne vjeruj ovom serveru"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will bje the default, so please add the most common localized nami to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
-msgstr ""
-"Smeće | Spam | Smeće pošta | Smeće Epošta | Smeće E-pošta | Rasuta pošta | "
-"Rasuta Epošta | Rasuta E-pošta"
+#~ msgid "_Undo"
+#~ msgstr "_Vrati"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will bje the default, so please add the most common localized nami to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Smeće | Otpad | Kanta za otpad"
+#~ msgid "_Redo"
+#~ msgstr "_Ponovi"
 
-#. / Format for the datetime that a message being replied to was received
-#. / Seje http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/engine/rfc822/rfc822-utils.vala:221
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %b %-e, %Y at %-l:%M %p"
+#~ msgid "Cu_t"
+#~ msgstr "_Isjeci"
 
-#. / The quoted header for a message being replied to.
-#. / %1$s will bje substituted for the date, and %2$s will bje substituted for
-#. / the original sender.
-#: ../src/engine/rfc822/rfc822-utils.vala:227
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "Na %1$s, %2$s je napisao/la:"
+#~ msgid "_Paste"
+#~ msgstr "_Umetni"
 
-#. / The quoted header for a message being replied to (in case the date is not known).
-#. / %s will bje replaced by the original sender.
-#: ../src/engine/rfc822/rfc822-utils.vala:234
-#, c-format
-msgid "%s wrote:"
-msgstr "%s je napisao/la:"
+#~ msgid "_Left"
+#~ msgstr "_Lijevo"
 
-#. / The quoted header for a message being replied to (in case the sender is not known).
-#. / %s will bje replaced by the original date
-#: ../src/engine/rfc822/rfc822-utils.vala:240
-#, c-format
-msgid "On %s:"
-msgstr "Na %s:"
+#~ msgid "_Right"
+#~ msgstr "_Desno"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Prosljeđena poruka ----------"
+#~ msgid "_Center"
+#~ msgstr "_Centrirano"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:273
-#, c-format
-msgid "From: %s\n"
-msgstr "Od: %s\n"
+#~ msgid "_Justify"
+#~ msgstr "_Slaganje redova"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:274
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Predmet: %s\n"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Veza (Crtl+L)"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Date: %s\n"
-msgstr "Datum: %s\n"
+#~ msgid "C_olor"
+#~ msgstr "B_oja"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:278
-#, c-format
-msgid "To: %s\n"
-msgstr "Za: %s\n"
+#~ msgid "More options"
+#~ msgstr "Više opcija"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:281
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Cc: %s\n"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Citiraj tekst (Ctrl+J)"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Korisnički račun se ne može ukloniti</"
-"span> "
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Završi citat (Ctrl+[)"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Prozor za stvaranje koji je povezan sa ovim korisničkim računom je trenutno "
-"otvoren. Pošaljite ili odbacite poruku i pokušajte ponovo."
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Ukloni formatiranje (Ctrl+Space)"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Dodaj korisnički račun"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Umetni _sa formatiranjem"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Izmjeni korisnički račun"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Boldiraj (Ctrl+B)"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Ukloni korisnički račun"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Ukošeno (Ctrl+I)"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Molim sačekajte dok Geary ne potvrdi vaš korisnički račun."
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Pudvučeno (Ctrl+U)"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Nepovjerljiva konekcija"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Precrtano (Ctrl+K)"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "_Uvijek vjeruj ovom serveru"
+#~ msgid "_Rich Text"
+#~ msgstr "_Rich Text"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "_Vjeruj ovom serveru"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Prikaži proširena polja"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "_Ne vjeruj ovom serveru"
+#~ msgid "Lar_ge"
+#~ msgstr "Veli_ko"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Vrati"
+#~ msgid "Large"
+#~ msgstr "Veliko"
 
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Ponovi"
+#~ msgid "_Medium"
+#~ msgstr "_Srednje"
 
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "_Isjeci"
+#~ msgid "Medium"
+#~ msgstr "Srednje"
 
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "_Umetni"
+#~ msgid "_Small"
+#~ msgstr "_Malo"
 
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Lijevo"
+#~ msgid "Small"
+#~ msgstr "Malo"
 
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Desno"
+#~ msgid "S_ans Serif"
+#~ msgstr "S_ans Serif"
 
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Centrirano"
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Slaganje redova"
+#~ msgid "S_erif"
+#~ msgstr "S_erif"
 
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Veza (Crtl+L)"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "B_oja"
+#~ msgid "_Fixed Width"
+#~ msgstr "_Fiksna širina"
 
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Više opcija"
+#~ msgid "Fixed Width"
+#~ msgstr "Fiksna širina"
 
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Citiraj tekst (Ctrl+J)"
+#~ msgid "Detach"
+#~ msgstr "Otkači"
 
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Završi citat (Ctrl+[)"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Otkači (Ctrl+D)"
 
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Ukloni formatiranje (Ctrl+Space)"
+#~ msgid "_Send"
+#~ msgstr "_Pošalji"
 
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Umetni _sa formatiranjem"
+#~ msgid "Send"
+#~ msgstr "Pošalji"
 
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Boldiraj (Ctrl+B)"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Pošalji(Ctrl+Enter)"
 
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Ukošeno (Ctrl+I)"
+#~ msgid "_Attach File"
+#~ msgstr "_Dodaj datoteku"
 
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Pudvučeno (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Precrtano (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "_Rich Text"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Prikaži proširena polja"
-
-#: ../ui/composer.glade.h:24
-msgid "Lar_ge"
-msgstr "Veli_ko"
-
-#: ../ui/composer.glade.h:25
-msgid "Large"
-msgstr "Veliko"
-
-#: ../ui/composer.glade.h:26
-msgid "_Medium"
-msgstr "_Srednje"
-
-#: ../ui/composer.glade.h:27
-msgid "Medium"
-msgstr "Srednje"
-
-#: ../ui/composer.glade.h:28
-msgid "_Small"
-msgstr "_Malo"
-
-#: ../ui/composer.glade.h:29
-msgid "Small"
-msgstr "Malo"
-
-#: ../ui/composer.glade.h:30
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
-
-#: ../ui/composer.glade.h:31
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: ../ui/composer.glade.h:32
-msgid "S_erif"
-msgstr "S_erif"
-
-#: ../ui/composer.glade.h:33
-msgid "Serif"
-msgstr "Serif"
-
-#: ../ui/composer.glade.h:34
-msgid "_Fixed Width"
-msgstr "_Fiksna širina"
-
-#: ../ui/composer.glade.h:35
-msgid "Fixed Width"
-msgstr "Fiksna širina"
-
-#: ../ui/composer.glade.h:36
-msgid "Detach"
-msgstr "Otkači"
-
-#: ../ui/composer.glade.h:37
-msgid "Detach (Ctrl+D)"
-msgstr "Otkači (Ctrl+D)"
-
-#: ../ui/composer.glade.h:38
-msgid "_Send"
-msgstr "_Pošalji"
-
-#: ../ui/composer.glade.h:39
-msgid "Send"
-msgstr "Pošalji"
-
-#: ../ui/composer.glade.h:40
-msgid "Send (Ctrl+Enter)"
-msgstr "Pošalji(Ctrl+Enter)"
-
-#: ../ui/composer.glade.h:41
-msgid "_Attach File"
-msgstr "_Dodaj datoteku"
-
-#: ../ui/composer.glade.h:42
-msgid "Attach File"
-msgstr "Dodaj datoteku"
+#~ msgid "Attach File"
+#~ msgstr "Dodaj datoteku"
 
-#: ../ui/composer.glade.h:43
-msgid "_Include Original Attachments"
-msgstr "_Uključi orginalne privitke"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Uključi orginalne privitke"
 
-#: ../ui/composer.glade.h:44
-msgid "Include Original Attachments"
-msgstr "Uključi orginalne privitke"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Uključi orginalne privitke"
 
-#. Address(es) e-mail is to bje sent to
-#: ../ui/composer.glade.h:46
-msgid "_To"
-msgstr "_Za"
+#~ msgid "_To"
+#~ msgstr "_Za"
 
-#: ../ui/composer.glade.h:47
-msgid "_Cc"
-msgstr "_Cc"
+#~ msgid "_Cc"
+#~ msgstr "_Cc"
 
-#: ../ui/composer.glade.h:48
-msgid "_Subject"
-msgstr "_Predmet"
+#~ msgid "_Subject"
+#~ msgstr "_Predmet"
 
-#: ../ui/composer.glade.h:49
-msgid "_Bcc"
-msgstr "_Bcc"
+#~ msgid "_Bcc"
+#~ msgstr "_Bcc"
 
-#: ../ui/composer.glade.h:50
-msgid "_Reply-To"
-msgstr "_Odgovori"
+#~ msgid "_Reply-To"
+#~ msgstr "_Odgovori"
 
-#. Geary account mail will bje sent from
-#: ../ui/composer.glade.h:52
-msgid "From"
-msgstr "Od"
+#~ msgid "From"
+#~ msgstr "Od"
 
-#: ../ui/composer.glade.h:53
-msgid "Drop files here"
-msgstr "Ispustiti datoteke ovdje"
+#~ msgid "Drop files here"
+#~ msgstr "Ispustiti datoteke ovdje"
 
-#: ../ui/composer.glade.h:54
-msgid "To add them as attachments"
-msgstr "Da biste ih dodali kao privitke"
+#~ msgid "To add them as attachments"
+#~ msgstr "Da biste ih dodali kao privitke"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Traži:"
+#~ msgid "Find:"
+#~ msgstr "Traži:"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Prethodno"
+#~ msgid "_Previous"
+#~ msgstr "_Prethodno"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Sljedeće"
+#~ msgid "_Next"
+#~ msgstr "_Sljedeće"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Osjetljivo na velika i mala slova"
+#~ msgid "_Case sensitive"
+#~ msgstr "_Osjetljivo na velika i mala slova"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "labela"
+#~ msgid "label"
+#~ msgstr "labela"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Lozinka"
+#~ msgid "Password"
+#~ msgstr "Lozinka"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "A_dresa e-pošte"
+#~ msgid "E_mail address"
+#~ msgstr "A_dresa e-pošte"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Lozinka"
+#~ msgid "_Password"
+#~ msgstr "_Lozinka"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "U_sluga"
+#~ msgid "S_ervice"
+#~ msgstr "U_sluga"
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "I_me"
+#~ msgid "N_ame"
+#~ msgstr "I_me"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "N_adimak"
+#~ msgid "N_ickname"
+#~ msgstr "N_adimak"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Poslovni, Kućni i sl."
+#~ msgid "Work, Home, etc."
+#~ msgstr "Poslovni, Kućni i sl."
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_Snimi poslanu poštu"
+#~ msgid "_Save sent mail"
+#~ msgstr "_Snimi poslanu poštu"
 
-#: ../ui/login.glade.h:10
-msgid "IMAP settings"
-msgstr "IMAP postavke"
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP postavke"
 
-#: ../ui/login.glade.h:11
-msgid "Se_rver"
-msgstr "Se_rver"
+#~ msgid "Se_rver"
+#~ msgstr "Se_rver"
 
-#: ../ui/login.glade.h:12
-msgid "P_ort"
-msgstr "P_ort"
+#~ msgid "P_ort"
+#~ msgstr "P_ort"
 
-#: ../ui/login.glade.h:13
-msgid "Ser_ver"
-msgstr "Ser_ver"
+#~ msgid "Ser_ver"
+#~ msgstr "Ser_ver"
 
-#: ../ui/login.glade.h:14
-msgid "Por_t"
-msgstr "Por_t"
+#~ msgid "Por_t"
+#~ msgstr "Por_t"
 
-#: ../ui/login.glade.h:15
-msgid "SMTP settings"
-msgstr "SMTP postavke"
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP postavke"
 
-#: ../ui/login.glade.h:16
-msgid "User_name"
-msgstr "Korisničko _ime"
+#~ msgid "User_name"
+#~ msgstr "Korisničko _ime"
 
-#: ../ui/login.glade.h:17
-msgid "Pass_word"
-msgstr "_Lozinka"
+#~ msgid "Pass_word"
+#~ msgstr "_Lozinka"
 
-#: ../ui/login.glade.h:18
-msgid "SMTP username"
-msgstr "SMTP korisničko ime"
+#~ msgid "SMTP username"
+#~ msgstr "SMTP korisničko ime"
 
-#: ../ui/login.glade.h:19
-msgid "SMTP password"
-msgstr "SMTP lozinka"
+#~ msgid "SMTP password"
+#~ msgstr "SMTP lozinka"
 
-#: ../ui/login.glade.h:20
-msgid "_Username"
-msgstr "_Korisničko ime"
+#~ msgid "_Username"
+#~ msgstr "_Korisničko ime"
 
-#: ../ui/login.glade.h:21
-msgid "IMAP username"
-msgstr "IMAP korisničko ime"
+#~ msgid "IMAP username"
+#~ msgstr "IMAP korisničko ime"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP password"
-msgstr "IMAP lozinka"
+#~ msgid "IMAP password"
+#~ msgstr "IMAP lozinka"
 
-#: ../ui/login.glade.h:23
-msgid "Encr_yption"
-msgstr "Enkr_ipcija"
+#~ msgid "Encr_yption"
+#~ msgstr "Enkr_ipcija"
 
-#: ../ui/login.glade.h:24
-msgid "Encrypt_ion"
-msgstr "Enkripc_ija"
+#~ msgid "Encrypt_ion"
+#~ msgstr "Enkripc_ija"
 
-#: ../ui/login.glade.h:26
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
 
-#: ../ui/login.glade.h:27
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/login.glade.h:28
-msgid "No authentication re_quired"
-msgstr "Ovjera nije pot_rebna"
+#~ msgid "No authentication re_quired"
+#~ msgstr "Ovjera nije pot_rebna"
 
-#: ../ui/login.glade.h:29
-msgid "Use IMAP cre_dentials"
-msgstr "KOristi IMAP akre_ditiv"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "KOristi IMAP akre_ditiv"
 
-#: ../ui/login.glade.h:30
-msgid "Storage"
-msgstr "Skladište"
+#~ msgid "Storage"
+#~ msgstr "Skladište"
 
-#: ../ui/login.glade.h:31
-msgid "_Download mail"
-msgstr "_Preuzmi poštu"
+#~ msgid "_Download mail"
+#~ msgstr "_Preuzmi poštu"
 
-#: ../ui/login.glade.h:32 ../ui/preferences.glade.h:4
-msgid "Composer"
-msgstr "Sastavljač"
+#~ msgid "Composer"
+#~ msgstr "Sastavljač"
 
-#: ../ui/login.glade.h:33
-msgid "Save dra_fts on server"
-msgstr "Smimi s_kice na server"
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Smimi s_kice na server"
 
-#: ../ui/login.glade.h:34
-msgid "Si_gn emails (HTML allowed):"
-msgstr "Pot_piši poštu (HTML dopušten):"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "Pot_piši poštu (HTML dopušten):"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "SMTP akreditivi"
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP akreditivi"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "Korisnik"
+#~ msgid "Username"
+#~ msgstr "Korisnik"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Zapamti lozinku"
+#~ msgid "_Remember password"
+#~ msgstr "_Zapamti lozinku"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Potvrdi identitet"
+#~ msgid "_Authenticate"
+#~ msgstr "_Potvrdi identitet"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Čitanje"
+#~ msgid "Reading"
+#~ msgstr "Čitanje"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "_Automatski označi slijedeću poruku"
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Automatski označi slijedeću poruku"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "_Prikaži pregled konverzacija"
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Prikaži pregled konverzacija"
 
-#: ../ui/preferences.glade.h:5
-msgid "Enable _spell checking"
-msgstr "Omogući provjeru _pravopisa"
+#~ msgid "Enable _spell checking"
+#~ msgstr "Omogući provjeru _pravopisa"
 
-#: ../ui/preferences.glade.h:6
-msgid "Notifications"
-msgstr "Obavještenja"
+#~ msgid "Notifications"
+#~ msgstr "Obavještenja"
 
-#: ../ui/preferences.glade.h:7
-msgid "_Play notification sounds"
-msgstr "_Emituj zvukove obavještenja"
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Emituj zvukove obavještenja"
 
-#: ../ui/preferences.glade.h:8
-msgid "Show _notifications for new mail"
-msgstr "Prikaži _obavještenje za novu poštu"
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Prikaži _obavještenje za novu poštu"
 
-#: ../ui/preferences.glade.h:9
-msgid "Always _watch for new mail"
-msgstr "Uvijek _prati novu poštu"
+#~ msgid "Always _watch for new mail"
+#~ msgstr "Uvijek _prati novu poštu"
 
-#: ../ui/preferences.glade.h:10
-msgid "Geary will run in the background and notify of new mail"
-msgstr "Geary će raditi u pozadini i informnisati o novoj pošti"
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr "Geary će raditi u pozadini i informnisati o novoj pošti"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Da li ste sigurni da želite ukloniti "
-"ovaj korisnički račun?</span> "
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Da li ste sigurni da želite ukloniti "
+#~ "ovaj korisnički račun?</span> "
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Sva e-pošta povezana sa ovim korisničkim računom biće uklonjena sa vašeg "
-"računara. Ovo se neće odraziti na e-poštu koja se nalazi na serveru."
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Sva e-pošta povezana sa ovim korisničkim računom biće uklonjena sa vašeg "
+#~ "računara. Ovo se neće odraziti na e-poštu koja se nalazi na serveru."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Nadimak:"
+#~ msgid "Nickname:"
+#~ msgstr "Nadimak:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Adresa e-pošte:"
+#~ msgid "Email address:"
+#~ msgstr "Adresa e-pošte:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Dogradnja Zupčinka je u toku…"
+#~ msgid "Geary update in progress…"
+#~ msgstr "Dogradnja Zupčinka je u toku…"
diff --git a/po/ca.po b/po/ca.po
index 40bbb69..67e8393 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,464 +10,425 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-18 15:50+0200\n"
-"PO-Revision-Date: 2013-09-20 19:28+0000\n"
-"Last-Translator: yorbajim <jim yorba org>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/geary/language/";
-"ca/)\n"
-"Language: ca\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 00:58+0000\n"
+"Last-Translator: Jim Nelson <jim yorba org>\n"
+"Language-Team: Catalan "
+"(http://www.transifex.com/projects/p/geary/language/ca/)\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"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-#, fuzzy
-msgid "Geary"
-msgstr "Geary Mail"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Client de correu"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary Mail"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Envieu i rebeu correus electrònics"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:53+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: ca\n"
 
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
 msgstr ""
 
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Redacta un missatge"
-
-#: ../desktop/geary-attach.contract.in.h:1
-#, fuzzy
-msgid "Send by email"
-msgstr "Envieu i rebeu correus electrònics"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "De_sa"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Afegeix"
-
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
-#, c-format
-msgid "Additional addresses for %s"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
 msgstr ""
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Comptes"
-
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
 msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Welcome to Geary."
-msgstr "Benvingut al Geary."
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Enter your account information to get started."
-msgstr "Introduïu la informació del vostre compte per començar."
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Safata d'entrada"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "2 weeks back"
-msgstr "Fa 2 setmanes"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Esborranys"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "1 month back"
-msgstr "Fa 1 mes"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Enviats"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "3 months back"
-msgstr "Fa 3 mesos"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Destacats"
 
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "6 months back"
-msgstr "Fa 6 mesos"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Important"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "1 year back"
-msgstr "Fa 1 any"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Tots"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-#, fuzzy
-msgid "2 years back"
-msgstr "Fa 1 any"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Correu brossa"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-#, fuzzy
-msgid "4 years back"
-msgstr "Fa 1 any"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Paperera"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "Everything"
-msgstr "Tot"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Safata de sortida"
 
-#: ../src/client/accounts/add-edit-page.vala:280
-msgid "Edit"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
 msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:282
-msgid "Preview"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
 msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:723
-msgid "Remem_ber passwords"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Cap"
+
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
 msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
-msgid "Remem_ber password"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
 msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:764
-msgid "Unable to validate:\n"
-msgstr "No s'ha pogut validar:\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:766
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Sobrenom del compte invàlid.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:769
-msgid "        &#8226; Email address already added to Geary.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
 msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:773
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; Error de connexió IMAP.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Un altre"
 
-#: ../src/client/accounts/add-edit-page.vala:776
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; Nom d'usuari o contrasenya d'IMAP incorrecte(s).\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; Error de connexió SMTP.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:782
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; Nom d'usuari o contrasenya d'SMTP incorrecte(s).\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:786
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Error de connexió.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:790
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Nom d'usuari o contrasenya incorrecte(s).\n"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr ""
 
-#: ../src/client/application/geary-application.vala:19
-#, fuzzy
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011-2013 Yorba Foundation"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr ""
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Visiteu el lloc web de Yorba"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr ""
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
 msgstr ""
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Sortida de la informació de depuració"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(sense assumpte)"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Registra el seguiment de les converses"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %-e de %b %Y a les %-l:%M %p"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
 msgstr ""
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Registra l'activitat de xarxa"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s ha escrit:"
 
-#. / 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 "Registra la cua de reproducció IMAP"
+#. / 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:234
+msgid "On %s:"
+msgstr ""
 
-#. / 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 "Registra la serialització de xarxa"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Missatge reenviat ----------"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Registra l'activitat periòdica"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "De: %s\n"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Registra les consultes a la base de dades (genera molts missatges)"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Assumpte: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Registra la normalització de carpetes"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Data: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Permet la inspecció del WebView"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Per a: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
 msgstr ""
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Mostra la versió del programa"
-
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr ""
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "cap"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Envieu comentaris, suggerències i errors a:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Client de correu"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "No s'han pogut interpretar les opcions de la línia d'ordres: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Opció de la línia d'ordres no reconeguda «%s»\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Visiteu el lloc web de Yorba"
 
-#: ../src/client/application/geary-controller.vala:62
-#, fuzzy
+#: ../src/client/application/geary-controller.vala:61
 msgid "Delete conversation"
-msgstr "Mou la conversa"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:63
-#, fuzzy
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
-msgstr "Esborra la conversa (Suprimir, Retrocés, A)"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:64
-#, fuzzy
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
-msgstr "Esborra converses (Suprimir, Retrocés, A)"
+msgstr ""
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:68
-#, fuzzy
+#: ../src/client/application/geary-controller.vala:67
 msgid "Move conversation to Trash (Delete, Backspace)"
-msgstr "Arxiva converses (Suprimir, Retrocés, A)"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:69
-#, fuzzy
+#: ../src/client/application/geary-controller.vala:68
 msgid "Move conversations to Trash (Delete, Backspace)"
-msgstr "Arxiva converses (Suprimir, Retrocés, A)"
+msgstr ""
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Arxiva"
 
-#: ../src/client/application/geary-controller.vala:74
-#, fuzzy
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
-msgstr "Mou la conversa"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:75
-#, fuzzy
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
-msgstr "Mou les converses"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:81
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Marca la conversa"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Marca les converses"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Afegeix etiqueta a la conversa"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Afegeix etiqueta a converses"
 
-#: ../src/client/application/geary-controller.vala:85
-#: ../src/client/application/geary-controller.vala:436
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Mou la conversa"
 
-#: ../src/client/application/geary-controller.vala:86
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Mou les converses"
 
-#: ../src/client/application/geary-controller.vala:373
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "_Comptes"
 
-#: ../src/client/application/geary-controller.vala:378
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Preferències"
 
-#: ../src/client/application/geary-controller.vala:382
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "A_juda"
 
-#: ../src/client/application/geary-controller.vala:386
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../src/client/application/geary-controller.vala:390
-msgid "_Donate"
-msgstr ""
-
-#: ../src/client/application/geary-controller.vala:394
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Surt"
 
-#: ../src/client/application/geary-controller.vala:399
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Marca com a..."
 
-#: ../src/client/application/geary-controller.vala:405
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Destaca"
 
-#: ../src/client/application/geary-controller.vala:422
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "_No destaquis"
 
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:433
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Etiqueta"
 
-#: ../src/client/application/geary-controller.vala:437
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Mou"
 
-#: ../src/client/application/geary-controller.vala:441
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr ""
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:445
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Respon"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:450
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr ""
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Reenvia"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:496
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:501
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:505
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr ""
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:538
+#: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:752
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:989
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "La vostra configuració no és segura"
 
-#: ../src/client/application/geary-controller.vala:990
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -477,49 +438,42 @@ msgstr ""
 "vostre nom d'usuari i contrasenya podrien ser llegits per una altra persona "
 "de la xarxa. Esteu segur que voleu fer això?"
 
-#: ../src/client/application/geary-controller.vala:991
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "Co_ntinua"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1070
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
 msgstr ""
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1075
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1144
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Etiquetes"
 
-#. 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:1156
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1157
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -532,38 +486,32 @@ msgid ""
 "<b>The mail on the your server will not be affected.</b>"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1168
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1169
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
 "%s"
 msgstr ""
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1191
-#: ../src/client/application/geary-controller.vala:1201
-#: ../src/client/application/geary-controller.vala:1212
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1192
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -574,7 +522,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1202
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -583,7 +531,7 @@ msgid ""
 "Please install the latest version of Geary and try again."
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1213
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -591,28 +539,29 @@ msgid ""
 "Please check your network connection and restart Geary."
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1721
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "Quant al %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1724
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
-msgstr "Martin Steghöfer <martin steghoefer de>, 2013"
+msgstr ""
+"Martin Steghöfer <martin steghoefer de>, 2013\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Jim Nelson https://launchpad.net/~yorba-jim";
 
-#: ../src/client/application/geary-controller.vala:1990
-#, fuzzy
+#: ../src/client/application/geary-controller.vala:1976
 msgid "Undo move (Ctrl+Z)"
-msgstr "Subratllat (Ctrl+U)"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:2000
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Esteu segur que voleu obrir «%s»?"
 
-#: ../src/client/application/geary-controller.vala:2001
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -620,484 +569,182 @@ msgstr ""
 "Els fitxers adjunts podrien danyar el vostre sistema. Obriu només fitxers de "
 "fonts fiables."
 
-#: ../src/client/application/geary-controller.vala:2002
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "No m'ho _tornis a preguntar"
 
-#: ../src/client/application/geary-controller.vala:2020
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Ja existeix un fitxer anomenat «%s». Voleu reemplaçar-lo?"
 
-#: ../src/client/application/geary-controller.vala:2022
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "El fitxer ja existeix a «%s». Reemplaçant-lo sobreescriureu el seu contingut."
 
-#: ../src/client/application/geary-controller.vala:2025
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Reemplaça"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2323
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:2453
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:2454
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:2455
-#, fuzzy
+#: ../src/client/application/geary-controller.vala:2441
 msgid "This cannot be undone."
-msgstr "No s'ha trobat \"%s\"."
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:2456
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:2473
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 msgid "Error emptying %s"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:2503
-#, fuzzy
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
-msgstr[0] "Voleu descartar el missatge sense desar?"
-msgstr[1] "Voleu descartar el missatge sense desar?"
-
-#: ../src/client/application/geary-controller.vala:2505
-#, fuzzy
-msgid "Delete"
-msgstr "_Suprimeix"
-
-#: ../src/client/application/geary-controller.vala:2536
-#, fuzzy
-msgid "Undo archive (Ctrl+Z)"
-msgstr "Subratllat (Ctrl+U)"
-
-#: ../src/client/application/geary-controller.vala:2551
-#, fuzzy
-msgid "Undo trash (Ctrl+Z)"
-msgstr "Subratllat (Ctrl+U)"
-
-#: ../src/client/application/geary-controller.vala:2604
-#, fuzzy
-msgid "Undo (Ctrl+Z)"
-msgstr "Subratllat (Ctrl+U)"
-
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr ""
-
-#: ../src/client/components/main-window.vala:428
-#, c-format
-msgid "%s (%d)"
-msgstr ""
-
-#: ../src/client/components/search-bar.vala:10
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr ""
-
-#. Search entry.
-#: ../src/client/components/search-bar.vala:25
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr ""
-
-#: ../src/client/components/search-bar.vala:118
-#, c-format
-msgid "Indexing %s account"
-msgstr ""
-
-#: ../src/client/components/search-bar.vala:129
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr ""
-
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr ""
-
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
+#: ../src/client/application/geary-controller.vala:2491
+msgid "Delete"
 msgstr ""
 
-#: ../src/client/components/stock.vala:19
-#: ../ui/edit_alternate_emails.glade.h:3 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Cancel·la"
-
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
 msgstr ""
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
 msgstr ""
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
 msgstr ""
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
 msgstr ""
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Eliminar"
-
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "Selecciona-ho _tot"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Sortida de la informació de depuració"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr ""
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Registra el seguiment de les converses"
 
-#: ../src/client/composer/composer-widget.vala:73
-msgid "Saved"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
 msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:74
-msgid "Saving"
-msgstr ""
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Registra l'activitat de xarxa"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "Error saving"
-msgstr ""
+#. / 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 "Registra la cua de reproducció IMAP"
 
-#: ../src/client/composer/composer-widget.vala:76
-msgid "Press Backspace to delete quote"
-msgstr ""
+#. / 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 "Registra la serialització de xarxa"
 
-#: ../src/client/composer/composer-widget.vala:77
-msgid "New Message"
-msgstr "Missatge nou"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Registra l'activitat periòdica"
 
-#. A 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:138
-msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
-msgstr ""
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Registra les consultes a la base de dades (genera molts missatges)"
 
-#: ../src/client/composer/composer-widget.vala:1102
-#: ../src/client/composer/composer-widget.vala:1106
-msgid "Do you want to discard this message?"
-msgstr ""
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Registra la normalització de carpetes"
 
-#: ../src/client/composer/composer-widget.vala:1262
-msgid "Send message with an empty subject and body?"
-msgstr ""
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Permet la inspecció del WebView"
 
-#: ../src/client/composer/composer-widget.vala:1264
-msgid "Send message with an empty subject?"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
 msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:1266
-msgid "Send message with an empty body?"
-msgstr ""
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Mostra la versió del programa"
 
-#: ../src/client/composer/composer-widget.vala:1268
-msgid "Send message without an attachment?"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
 msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:1530
-msgid "Cannot add attachment"
-msgstr "No s'ha pogut adjuntar el fitxer"
-
-#: ../src/client/composer/composer-widget.vala:1541
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "No s'ha trobat \"%s\"."
-
-#: ../src/client/composer/composer-widget.vala:1548
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" és un directori."
-
-#: ../src/client/composer/composer-widget.vala:1555
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" és un fitxer buit."
-
-#: ../src/client/composer/composer-widget.vala:1569
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "No s'ha pogut obrir \"%s\" per llegir."
-
-#: ../src/client/composer/composer-widget.vala:1576
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" ja està seleccionat com a fitxer adjunt."
-
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1585
-#, c-format
-msgid "%s (%s)"
-msgstr ""
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Envieu comentaris, suggerències i errors a:"
 
-#: ../src/client/composer/composer-widget.vala:1645
-#, fuzzy
-msgid "To: "
-msgstr "Per a: %s\n"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "No s'han pogut interpretar les opcions de la línia d'ordres: %s\n"
 
-#: ../src/client/composer/composer-widget.vala:1648
-msgid "Cc: "
-msgstr ""
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Opció de la línia d'ordres no reconeguda «%s»\n"
 
-#: ../src/client/composer/composer-widget.vala:1651
-#, fuzzy
-msgid "Bcc: "
-msgstr "CCO:"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Missatges Nous"
 
-#: ../src/client/composer/composer-widget.vala:1654
-#, fuzzy
-msgid "Reply-To: "
-msgstr "_Respon"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d missatge nou"
+msgstr[1] "%d missatges nous"
 
-#: ../src/client/composer/composer-widget.vala:1887
-msgid "Select Color"
-msgstr "Selecciona el color"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] ""
+msgstr[1] ""
 
-#. 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:2322
-#, c-format
-msgid "%1$s via %2$s"
-msgstr ""
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2364
-#, fuzzy
-msgid "_From:"
-msgstr "De:"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Obre"
 
 #: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Jo"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:413
-msgid "No conversations selected."
-msgstr "No hi ha cap conversa seleccionada."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, fuzzy, c-format
-msgid "%u conversation selected."
-msgid_plural "%u conversations selected."
-msgstr[0] "%u converses seleccionades."
-msgstr[1] "%u converses seleccionades."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:444
-msgid "No search results found."
-msgstr ""
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:446
-msgid "No conversations in folder."
-msgstr ""
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:708
-msgid "This message contains remote images."
-msgstr ""
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:708
-msgid "Show Images"
-msgstr ""
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:709
-msgid "Always Show From Sender"
-msgstr ""
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:733
-msgid "Edit Draft"
-msgstr ""
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:809
-msgid "From:"
-msgstr "De:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:812
-msgid "To:"
-msgstr "Per a:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:815
-msgid "Cc:"
-msgstr "CC:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:818
-msgid "Bcc:"
-msgstr "CCO:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:821
-msgid "Subject:"
-msgstr "Assumpte:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:824
-msgid "Date:"
-msgstr "Data:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, fuzzy, c-format
-msgid "%u read message"
-msgid_plural "%u read messages"
-msgstr[0] "%u missatges llegits"
-msgstr[1] "%u missatges llegits"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
-msgid "This message was sent successfully, but could not be saved to %s."
-msgstr ""
-
-#. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
-msgid "_Copy"
-msgstr "_Copia"
-
-#. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
-msgid "Copy _Email Address"
-msgstr "Copia l'adreça _electrònica"
-
-#. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
-msgid "Copy _Link"
-msgstr "Copia l'en_llaç"
-
-#. Select message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
-msgid "Select _Message"
-msgstr ""
-
-#. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
-msgid "_Inspect"
-msgstr "_Inspecciona"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
-msgid "This link appears to go to"
-msgstr ""
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
-msgid "but actually goes to"
-msgstr ""
-
-#. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
-msgid " (Invalid?)"
-msgstr ""
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
-msgid "_Save Image As..."
-msgstr ""
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
-msgid "_Save As..."
-msgstr "_Desa i anomena..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
-msgid "Save All A_ttachments..."
-msgstr "Desa tots els fitxers ad_junts..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "Desa el fitxer ad_junt..."
-msgstr[1] "Desa tots els fitxers ad_junts..."
-
-#. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
-msgid "Reply to _All"
-msgstr "Respon a _tots"
-
-#. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
-msgid "_Mark as Read"
-msgstr "_Marca com a llegit"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
-msgid "_Mark as Unread"
-msgstr "_Marca com a no llegit"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
-msgid "Mark Unread From _Here"
-msgstr ""
-
-#. Separator.
-#. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
-msgid "_View Source"
-msgstr "_Visualitza la font"
-
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:378
-msgid "none"
-msgstr "cap"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
-msgid "Failed to open default text editor."
-msgstr "No s'ha pogut obrir l'editor de textos predeterminat."
-
-#: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - Inspector de converses"
-
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Escolliu un fitxer"
-
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Adjunta"
-
 #: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
 msgid "Untrusted Connection: %s"
 msgstr ""
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
 msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr ""
 
@@ -1161,82 +808,132 @@ msgstr ""
 msgid "An error has occurred processing the server's certificate"
 msgstr ""
 
-#. 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
-#, fuzzy
 msgid "Geary requires your email password to continue"
-msgstr "Introduïu la contrasenya del vostre correu electrònic"
+msgstr ""
 
-#. 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] ""
-msgstr[1] ""
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Escolliu un fitxer"
 
-#. / 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] ""
-msgstr[1] ""
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Adjunta"
 
-#. / 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"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
 msgstr ""
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Safates d'entrada"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Comptes"
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] ""
-msgstr[1] ""
+#. / 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 ""
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Missatges Nous"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Benvingut al Geary."
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d missatge nou"
-msgstr[1] "%d missatges nous"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Introduïu la informació del vostre compte per començar."
 
-#: ../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] ""
-msgstr[1] ""
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "Fa 2 setmanes"
 
-#: ../src/client/notification/libnotify.vala:107
-#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
-msgstr[1] ""
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "Fa 1 mes"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Obre"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "Fa 3 mesos"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "Fa 6 mesos"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "Fa 1 any"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Tot"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "No s'ha pogut validar:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Sobrenom del compte invàlid.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Error de connexió IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Nom d'usuari o contrasenya d'IMAP incorrecte(s).\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Error de connexió SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; Nom d'usuari o contrasenya d'SMTP incorrecte(s).\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Error de connexió.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Nom d'usuari o contrasenya incorrecte(s).\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "De_sa"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Afegeix"
 
 #. / 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
@@ -1294,14 +991,12 @@ msgid "Now"
 msgstr ""
 
 #: ../src/client/util/util-date.vala:167
-#, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/util/util-date.vala:171
-#, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
 msgstr[0] ""
@@ -1314,15 +1009,9 @@ msgstr ""
 #. / 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 ""
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(sense assumpte)"
-
 #: ../src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "bytes"
@@ -1347,796 +1036,503 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KB"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
+#. / 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
+msgid "%s, %s"
 msgstr ""
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Un altre"
-
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr ""
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Safates d'entrada"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
 msgstr ""
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Safata d'entrada"
-
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Esborranys"
-
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Enviats"
-
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Destacats"
-
-#: ../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 "Tots"
-
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Correu brossa"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Paperera"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "No hi ha cap conversa seleccionada."
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Safata de sortida"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
 msgstr ""
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-msgstr "Cap"
-
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-#, fuzzy
-msgid "attachment"
-msgstr "Desa el fitxer ad_junt"
-
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
 msgstr ""
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
 msgstr ""
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-#, fuzzy
-msgid "cc"
-msgstr "CCO:"
-
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
 msgstr ""
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-#, fuzzy
-msgid "subject"
-msgstr "Assumpte:"
-
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
 msgstr ""
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
 msgstr ""
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-#, fuzzy
-msgid "Drafts | Draft"
-msgstr "Esborranys"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "De:"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "Per a:"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "CC:"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "CCO:"
 
-#. / 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:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %-e de %b %Y a les %-l:%M %p"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "Assumpte:"
 
-#. / 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:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Data:"
 
-#. / 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:228
-#, c-format
-msgid "%s wrote:"
-msgstr "%s ha escrit:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#. / 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:234
-#, c-format
-msgid "On %s:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
 msgstr ""
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Missatge reenviat ----------"
-
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "De: %s\n"
-
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Assumpte: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "_Copia"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "Data: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "Copia l'adreça _electrònica"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "Per a: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "Copia l'en_llaç"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
 msgstr ""
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">No s'ha pogut eliminar el compte</"
-"span> "
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Selecciona-ho _tot"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Hi ha una finestra de redacció associada a aquest compte que està oberta. "
-"Desa o descarta el missatge i torna-ho a intentar."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "_Inspecciona"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
 msgstr ""
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
 msgstr ""
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
 msgstr ""
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Espereu mentre Geary està validant el vostre compte."
-
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
 msgstr ""
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_Desa i anomena..."
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "Desa tots els fitxers ad_junts..."
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] "Desa el fitxer ad_junt..."
+msgstr[1] "Desa tots els fitxers ad_junts..."
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "Respon a _tots"
 
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "_Marca com a llegit"
 
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "_Marca com a no llegit"
 
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
 msgstr ""
 
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Esquerra"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Dreta"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Centrat"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Justificat"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "_Visualitza la font"
 
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Enllaç (Ctrl+L)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "No s'ha pogut obrir l'editor de textos predeterminat."
 
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "C_olor"
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr "%s - Inspector de converses"
 
-#: ../ui/composer.glade.h:12
-msgid "More options"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
 msgstr ""
 
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
 msgstr ""
 
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
 msgstr ""
 
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Suprimeix la formatació (Ctrl+Espai)"
-
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
 msgstr ""
 
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Negreta (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Cursiva (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Subratllat (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Barrat (Ctrl+K)"
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Missatge nou"
 
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
+#: ../src/client/composer/composer-widget.vala:138
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
 
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
 msgstr ""
 
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
 msgstr ""
 
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
 msgstr ""
 
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
 msgstr ""
 
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
 msgstr ""
 
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr ""
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "No s'ha pogut adjuntar el fitxer"
 
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr ""
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "No s'ha trobat \"%s\"."
 
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr ""
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" és un directori."
 
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "Gran"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" és un fitxer buit."
 
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr ""
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "No s'ha pogut obrir \"%s\" per llegir."
 
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "Mitjà"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "\"%s\" ja està seleccionat com a fitxer adjunt."
 
-#: ../ui/composer.glade.h:34
-msgid "_Small"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
 msgstr ""
 
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "Petit"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
 msgstr ""
 
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
 msgstr ""
 
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "Serif"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
 msgstr ""
 
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
 msgstr ""
 
-#: ../ui/composer.glade.h:42
-#, fuzzy
-msgid "Detach"
-msgstr "_Adjunta"
-
-#: ../ui/composer.glade.h:43
-#, fuzzy
-msgid "Detach (Ctrl+D)"
-msgstr "Cursiva (Ctrl+I)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_Envia"
-
-#: ../ui/composer.glade.h:45
-#, fuzzy
-msgid "Send"
-msgstr "_Envia"
-
-#: ../ui/composer.glade.h:46
-#, fuzzy
-msgid "Send (Ctrl+Enter)"
-msgstr "Negreta (Ctrl+B)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "_Adjunta fitxer"
-
-#: ../ui/composer.glade.h:48
-#, fuzzy
-msgid "Attach File"
-msgstr "_Adjunta fitxer"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Selecciona el color"
 
-#: ../ui/composer.glade.h:49
-msgid "_Include Original Attachments"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
 msgstr ""
 
-#: ../ui/composer.glade.h:50
-msgid "Include Original Attachments"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
 msgstr ""
 
-#: ../ui/composer.glade.h:51
-msgid "Application Menu"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
 msgstr ""
 
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:53
-#, fuzzy
-msgid "_To"
-msgstr "Per a:"
-
-#: ../ui/composer.glade.h:54
-#, fuzzy
-msgid "_Cc"
-msgstr "CC:"
-
-#: ../ui/composer.glade.h:55
-#, fuzzy
-msgid "_Subject"
-msgstr "Assumpte:"
-
-#: ../ui/composer.glade.h:56
-msgid "_Bcc"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
 msgstr ""
 
-#: ../ui/composer.glade.h:57
-#, fuzzy
-msgid "_Reply-To"
-msgstr "_Respon"
-
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:59
-#, fuzzy
-msgid "From"
-msgstr "De:"
-
-#: ../ui/composer.glade.h:60
-msgid "Drop files here"
-msgstr "Deixeu anar els fitxers aquí"
-
-#: ../ui/composer.glade.h:61
-msgid "To add them as attachments"
-msgstr "Per afegir-los com a adjunts"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../ui/edit_alternate_emails.glade.h:1
-#, fuzzy
-msgid "Remove email address"
-msgstr "Adreça de correu electrònic"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
 msgstr ""
 
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
 msgstr ""
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr ""
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Cancel·la"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
 msgstr ""
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
 msgstr ""
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
 msgstr ""
 
-#: ../ui/find_bar.glade.h:5
-#, fuzzy
-msgid "label"
-msgstr "Etiquetes"
-
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
 msgstr ""
 
-#: ../ui/login.glade.h:2
-#, fuzzy
-msgid "E_mail address"
-msgstr "Adreça de correu electrònic"
-
-#: ../ui/login.glade.h:3
-#, fuzzy
-msgid "_Password"
-msgstr "_Contrasenya:"
-
-#: ../ui/login.glade.h:4
-#, fuzzy
-msgid "S_ervice"
-msgstr "Servei:"
-
-#: ../ui/login.glade.h:5
-#, fuzzy
-msgid "N_ame"
-msgstr "N_om:"
-
-#: ../ui/login.glade.h:7
-#, fuzzy
-msgid "N_ickname"
-msgstr "Sobrenom:"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Eliminar"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
 msgstr ""
 
-#: ../ui/login.glade.h:9
-#, fuzzy
-msgid "_Save sent mail"
-msgstr "Enviats"
-
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
 msgstr ""
 
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "Configuració de l'IMAP"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr ""
 
-#: ../ui/login.glade.h:12
-#, fuzzy
-msgid "Se_rver"
-msgstr "Se_rvidor:"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary Mail"
 
-#: ../ui/login.glade.h:13
-#, fuzzy
-msgid "P_ort"
-msgstr "P_ort:"
+#~ msgid "Send and receive email"
+#~ msgstr "Envieu i rebeu correus electrònics"
 
-#: ../ui/login.glade.h:14
-#, fuzzy
-msgid "Ser_ver"
-msgstr "Ser_vidor:"
+#~ msgid "Compose Message"
+#~ msgstr "Redacta un missatge"
 
-#: ../ui/login.glade.h:15
-#, fuzzy
-msgid "Por_t"
-msgstr "Por_t:"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">No s'ha pogut eliminar el "
+#~ "compte</span> "
 
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "Configuració del SMTP"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Hi ha una finestra de redacció associada a aquest compte que està oberta. "
+#~ "Desa o descarta el missatge i torna-ho a intentar."
 
-#: ../ui/login.glade.h:17
-#, fuzzy
-msgid "User_name"
-msgstr "_Nom d'usuari:"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Espereu mentre Geary està validant el vostre compte."
 
-#: ../ui/login.glade.h:18
-#, fuzzy
-msgid "Pass_word"
-msgstr "Contrasen_ya"
+#~ msgid "_Left"
+#~ msgstr "_Esquerra"
 
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr ""
+#~ msgid "_Right"
+#~ msgstr "_Dreta"
 
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr ""
+#~ msgid "_Center"
+#~ msgstr "_Centrat"
 
-#: ../ui/login.glade.h:21
-#, fuzzy
-msgid "_Username"
-msgstr "Nom d'_usuari:"
+#~ msgid "_Justify"
+#~ msgstr "_Justificat"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr ""
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Enllaç (Ctrl+L)"
 
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr ""
+#~ msgid "C_olor"
+#~ msgstr "C_olor"
 
-#: ../ui/login.glade.h:24
-#, fuzzy
-msgid "Encr_yption"
-msgstr "Encr_iptació:"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Suprimeix la formatació (Ctrl+Espai)"
 
-#: ../ui/login.glade.h:25
-#, fuzzy
-msgid "Encrypt_ion"
-msgstr "Encri_ptació:"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Negreta (Ctrl+B)"
 
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr ""
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Cursiva (Ctrl+I)"
 
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Subratllat (Ctrl+U)"
 
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "_No es requereix autenticació"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Barrat (Ctrl+K)"
 
-#: ../ui/login.glade.h:30
-#, fuzzy
-msgid "Use IMAP cre_dentials"
-msgstr "Credencials IMAP"
+#~ msgid "Large"
+#~ msgstr "Gran"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Autor"
+#~ msgid "Medium"
+#~ msgstr "Mitjà"
 
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr ""
+#~ msgid "Small"
+#~ msgstr "Petit"
 
-#: ../ui/login.glade.h:33
-msgid "Si_gn emails (HTML allowed):"
-msgstr ""
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "Emmagatzematge"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../ui/login.glade.h:35
-#, fuzzy
-msgid "_Download mail"
-msgstr "_Baixa el missatge:"
+#~ msgid "_Send"
+#~ msgstr "_Envia"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "Credencials SMTP"
+#~ msgid "_Attach File"
+#~ msgstr "_Adjunta fitxer"
 
-#: ../ui/password-dialog.glade.h:2
-#, fuzzy
-msgid "Username"
-msgstr "Nom d'usuari:"
+#~ msgid "Drop files here"
+#~ msgstr "Deixeu anar els fitxers aquí"
 
-#: ../ui/password-dialog.glade.h:4
-#, fuzzy
-msgid "_Remember password"
-msgstr "_Recorda les contrasenyes"
+#~ msgid "To add them as attachments"
+#~ msgstr "Per afegir-los com a adjunts"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr ""
+#~ msgid "IMAP settings"
+#~ msgstr "Configuració de l'IMAP"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Lectura"
+#~ msgid "SMTP settings"
+#~ msgstr "Configuració del SMTP"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "Selecciona el missatge següent _automàticament"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr ""
+#~ msgid "No authentication re_quired"
+#~ msgstr "_No es requereix autenticació"
 
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr ""
+#~ msgid "Composer"
+#~ msgstr "Autor"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "Activa la verificació de l'_ortografia"
+#~ msgid "Storage"
+#~ msgstr "Emmagatzematge"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "Notificacions"
+#~ msgid "SMTP Credentials"
+#~ msgstr "Credencials SMTP"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "_Reprodueix un so per a les notificacions"
+#~ msgid "Reading"
+#~ msgstr "Lectura"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "Mostra _notificacions quan arribi correu nou"
+#~ msgid "_Automatically select next message"
+#~ msgstr "Selecciona el missatge següent _automàticament"
 
-#: ../ui/preferences.glade.h:10
-#, fuzzy
-msgid "Always _watch for new mail"
-msgstr "Mostra _notificacions quan arribi correu nou"
+#~ msgid "Enable _spell checking"
+#~ msgstr "Activa la verificació de l'_ortografia"
 
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr ""
+#~ msgid "Notifications"
+#~ msgstr "Notificacions"
 
-#: ../ui/preferences.glade.h:12
-#, fuzzy
-msgid "Preferences"
-msgstr "_Preferències"
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Reprodueix un so per a les notificacions"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">N'esteu segur que voleu eliminar "
-"aquest compte?</span> "
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Mostra _notificacions quan arribi correu nou"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Tots els missatges associats a aquest compte s'eliminaran del vostre "
-"ordinador. Això no afectarà els missatges al servidor."
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">N'esteu segur que voleu eliminar "
+#~ "aquest compte?</span> "
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Sobrenom:"
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Tots els missatges associats a aquest compte s'eliminaran del vostre "
+#~ "ordinador. Això no afectarà els missatges al servidor."
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Adreça de correu electrònic:"
+#~ msgid "Nickname:"
+#~ msgstr "Sobrenom:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr ""
+#~ msgid "Email address:"
+#~ msgstr "Adreça de correu electrònic:"
 
 #~ msgid "Archive conversation (Delete, Backspace, A)"
 #~ msgstr "Arxiva la conversa (Suprimir, Retrocés, A)"
@@ -2160,8 +1556,7 @@ msgstr ""
 #~ msgstr "Servidor:"
 
 #~ msgid "Unable to login to email server"
-#~ msgstr ""
-#~ "No s'ha pogut entrar al teu compte al servidor del correu electrònic"
+#~ msgstr "No s'ha pogut entrar al teu compte al servidor del correu electrònic"
 
 #~ msgid "_Details"
 #~ msgstr "_Detalls"
diff --git a/po/cs.po b/po/cs.po
index 4cf8a01..8b1426f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,454 +10,432 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-05-31 17:11+0000\n"
-"PO-Revision-Date: 2015-05-31 21:21+0200\n"
-"Last-Translator: Marek Černocký <marek manet cz>\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 00:58+0000\n"
+"Last-Translator: Marv-CZ <marek manet cz>\n"
 "Language-Team: Czech <gnome-cs-list gnome org>\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Gtranslator 2.91.7\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Poštovní klient"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Pošta Geary"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Odesílat a přijímat e-maily"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "email;e-mail;mail;pošta;e-pošta;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Napsat zprávu"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Odeslat e-mailem"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Odeslat soubory pomocí aplikace Geary"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Uložit"
+"X-Launchpad-Export-Date: 2015-11-23 05:53+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: cs\n"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Přidat"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr ""
+"Drafts | Koncepty | Koncept | Rozepsané | Rozepsané zprávy | Rozepsané e-"
+"maily"
 
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "Dodatečné adresy pro %s"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
+"Sent | Odeslané | Odeslaná pošta  | Odeslané zprávy | Odeslané e-maily"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Účty"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
+"Junk | Spam | Nevyžádané | Nevyžádané zprávy | Nevyžádaná pošta | Nevyžádané "
+"e-maily"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "První poslední"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Trash | Koš | Smazané | Smazané zprávy | Smazaná pošta"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Welcome to Geary."
-msgstr "Vítejte v Geary."
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr "Archiv | Archív | Archivy | Archívy | Archive | Archives"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Enter your account information to get started."
-msgstr "Nejprve vyplňte informace o svém účtu."
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Doručená pošta"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "2 weeks back"
-msgstr "2 týdny nazpět"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Koncepty"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "1 month back"
-msgstr "1 měsíc nazpět"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Odeslaná pošta"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "3 months back"
-msgstr "3 měsíce nazpět"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "S hvězdičkou"
 
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "6 months back"
-msgstr "6 měsíců nazpět"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Důležité"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "1 year back"
-msgstr "1 rok nazpět"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Všechny zprávy"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-msgid "2 years back"
-msgstr "2 roky nazpět"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Nevyžádaná"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-msgid "4 years back"
-msgstr "4 roky nazpět"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Koš"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "Everything"
-msgstr "Vše"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "K odeslání"
 
-#: ../src/client/accounts/add-edit-page.vala:280
-msgid "Edit"
-msgstr "Úprava"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Hledat"
 
-#: ../src/client/accounts/add-edit-page.vala:282
-msgid "Preview"
-msgstr "Náhled"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Archiv"
 
-#: ../src/client/accounts/add-edit-page.vala:723
-msgid "Remem_ber passwords"
-msgstr "Pama_tovat si hesla"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Žádný"
 
-#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "Pama_tovat si heslo"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:764
-msgid "Unable to validate:\n"
-msgstr "Nelze ověřit:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:766
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Neplatná přezdívka účtu.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:769
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; E-mailová adresa už byla do Geary přidána.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:773
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; Chyba připojení IMAP.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:776
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; Nesprávné uživatelské jméno nebo heslo pro IMAP.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Jiná"
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; Chyba připojení SMTP.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "příloha"
 
-#: ../src/client/accounts/add-edit-page.vala:782
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; Nesprávné uživatelské jméno nebo heslo pro SMTP.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "skrytá kopie"
 
-#: ../src/client/accounts/add-edit-page.vala:786
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Chyba připojení.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "tělo"
 
-#: ../src/client/accounts/add-edit-page.vala:790
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Nesprávné uživatelské jméno nebo heslo.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "kopie"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011 – 2015 Yorba Foundation"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "od"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Navštívit webové stránky Yorba"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "předmět"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Spustit Geary se skrytým hlavním oknem"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "komu"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Vypisovat ladicí informace"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "já"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Zaznamenávat sledování konverzace"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(bez předmětu)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Zaznamenávat síťové deserializace"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %b %-e, %Y v %-l∶%M %p"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Zaznamenávat aktivity sítě"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "%2$s napsal %1$s:"
 
-#. / 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 "Zaznamenávat přehrání fronty IMAP"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s napsal:"
 
-#. / 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 "Zaznamenávat síťové serializace"
+#. / 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:234
+msgid "On %s:"
+msgstr "%s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Zaznamenávat opakující se aktivity"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Přeposlaná zpráva ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Zaznamenávat databázové dotazy (generuje velké množství zpráv)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Od: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Zaznamenávat normalizace složky"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Předmět: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Povolit kontrolu WebView"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Datum: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Odvolat všechny serverové certifikáty s varováními TLS"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Komu: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Zobrazit verzi programu"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Kopie: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Použít %s k otevření nového okna pro psaní zprávy"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "žádný"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Připomínky, návrhy a chyby hlaste prosím na:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Poštovní klient"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Nepodařilo se zpracovat přepínače příkazového řádku: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "Copyright 2011 – 2015 Yorba Foundation"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Nerozpoznaný přepínač příkazového řádku „%s“\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Navštívit webové stránky Yorba"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:61
 msgid "Delete conversation"
 msgstr "Vymazat konverzaci"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Vymazat konverzaci (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Vymazat konverzace (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:67
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Přesunout konverzaci do Koše (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:68
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "Přesunout konverzace do Koše (Delete, Backspace)"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Archivovat"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Archivovat konverzaci (A)"
 
-#: ../src/client/application/geary-controller.vala:75
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Archivovat konverzace (A)"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Označit jako nevyžá_dané"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Označit, že není nevyžá_dané"
 
-#: ../src/client/application/geary-controller.vala:81
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Označit konverzaci"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Označit konverzace"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Přiřadit konverzaci štítek"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Přiřadit konverzacím štítek"
 
-#: ../src/client/application/geary-controller.vala:85
-#: ../src/client/application/geary-controller.vala:436
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Přesunout konverzaci"
 
-#: ../src/client/application/geary-controller.vala:86
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Přesunout konverzace"
 
-#: ../src/client/application/geary-controller.vala:373
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "Úč_ty"
 
-#: ../src/client/application/geary-controller.vala:378
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Předvolby"
 
-#: ../src/client/application/geary-controller.vala:382
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "Nápo_věda"
 
-#: ../src/client/application/geary-controller.vala:386
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "O _aplikaci"
 
-#: ../src/client/application/geary-controller.vala:390
-msgid "_Donate"
-msgstr "_Darovat"
-
-#: ../src/client/application/geary-controller.vala:394
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "U_končit"
 
-#: ../src/client/application/geary-controller.vala:399
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "Oz_načit jako…"
 
-#: ../src/client/application/geary-controller.vala:405
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Označit jako _přečtené"
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Označit jako _nepřečtené"
 
-#: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Hvězdička"
 
-#: ../src/client/application/geary-controller.vala:422
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "O_debrat hvězdičku"
 
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Přidat štítek"
 
-#: ../src/client/application/geary-controller.vala:433
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "Štít_ek"
 
-#: ../src/client/application/geary-controller.vala:437
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Přesunout"
 
-#: ../src/client/application/geary-controller.vala:441
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Napsat novou zprávu (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:445
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Odpovědět"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Odpovědět (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:450
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "O_dpovědět všem"
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Odpovědět všem (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Přeposlat"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Přeposlat (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:496
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr "Vyprázdnit"
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr "Vyprázdnit složku Nevyžádané nebo Koš"
 
-#: ../src/client/application/geary-controller.vala:501
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr "Vyprázdnit _nevyžádanou…"
 
-#: ../src/client/application/geary-controller.vala:505
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr "Vyprázdnit koš…"
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:538
+#: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
 msgstr "Přepnout vyhledávací lištu"
 
-#: ../src/client/application/geary-controller.vala:752
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Nelze uložit výjimku důvěry k serveru"
 
-#: ../src/client/application/geary-controller.vala:989
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Vaše nastavení není bezpečené"
 
-#: ../src/client/application/geary-controller.vala:990
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -467,17 +445,17 @@ msgstr ""
 "vaše uživatelské jméno a heslo může číst jiná osoba na síti. Opravdu to tak "
 "chcete?"
 
-#: ../src/client/application/geary-controller.vala:991
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "Po_kračovat"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Chyba při odesílání e-mailu"
 
-#: ../src/client/application/geary-controller.vala:1070
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -485,14 +463,12 @@ msgstr ""
 "V Geary došlo k chybě při odesílání e-mailu. Pokud problém přetrvává, "
 "odstraňte prosím e-mail ručně ze složky Pošta k odeslání."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Chyba při ukládání odeslané pošty"
 
-#: ../src/client/application/geary-controller.vala:1075
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -500,20 +476,15 @@ msgstr ""
 "V Geary došlo k chybě při ukládání odeslané zprávy. Zpráva zůstane ve vaší "
 "složce Pošta k odeslání, dokud ji nesmažete."
 
-#: ../src/client/application/geary-controller.vala:1144
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Štítky"
 
-#. 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:1156
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Nelze otevřít databázi pro %s"
 
-#: ../src/client/application/geary-controller.vala:1157
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -536,21 +507,19 @@ msgstr ""
 "Opětovné sestavení databáze zničí všechny místně uložené e-maily a jejich "
 "přílohy <b>Na e-maily na vašem serveru to nebude mít vliv.</b>"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "Znovu _sestavit"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "S_končit"
 
-#: ../src/client/application/geary-controller.vala:1168
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Nelze znovu sestavit databázi pro „%s“"
 
-#: ../src/client/application/geary-controller.vala:1169
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -560,17 +529,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1191
-#: ../src/client/application/geary-controller.vala:1201
-#: ../src/client/application/geary-controller.vala:1212
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Nelze otevřít místní poštovní schránku pro %s"
 
-#: ../src/client/application/geary-controller.vala:1192
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -588,7 +553,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1202
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -601,7 +566,7 @@ msgstr ""
 "\n"
 "Nainstalujte prosím nejnovější verzi Geary a zkuste to znovu."
 
-#: ../src/client/application/geary-controller.vala:1213
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -614,331 +579,567 @@ msgstr ""
 "\n"
 "Zkontrolujte prosím připojení k síti a restartujte Geary."
 
-#: ../src/client/application/geary-controller.vala:1721
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "O aplikaci %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1724
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
 msgstr ""
 "Petr Šimáček <petr simacek gmail com>\n"
-"Marek Černocký <marek manet cz>"
+"Marek Černocký <marek manet cz>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Marv-CZ https://launchpad.net/~marek-manet";
 
-#: ../src/client/application/geary-controller.vala:1990
+#: ../src/client/application/geary-controller.vala:1976
 msgid "Undo move (Ctrl+Z)"
 msgstr "Zpět přesun (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2000
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Opravdu chcete otevřít „%s“?"
 
-#: ../src/client/application/geary-controller.vala:2001
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
 msgstr ""
 "Příloha by po otevření mohla poškodit váš počítač. Otevírejte pouze soubory "
-"z důvěryhodných zdrojů. "
+"z důvěryhodných zdrojů."
 
-#: ../src/client/application/geary-controller.vala:2002
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Příště se nept_at"
 
-#: ../src/client/application/geary-controller.vala:2020
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Soubor s názvem „%s“ již existuje. Chcete ho nahradit?"
 
-#: ../src/client/application/geary-controller.vala:2022
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "Soubor již existuje v „%s“. Nahrazením přepíšete jeho obsah."
 
-#: ../src/client/application/geary-controller.vala:2025
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "Nah_radit"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2323
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Zavřít otevřený koncept zprávy?"
 
-#: ../src/client/application/geary-controller.vala:2453
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr "Vyprázdnit všechny zprávy z vaší složky %s?"
 
-#: ../src/client/application/geary-controller.vala:2454
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr "Tímto se odstraní pošta z aplikace Geary i z poštovního serveru."
 
-#: ../src/client/application/geary-controller.vala:2455
+#: ../src/client/application/geary-controller.vala:2441
 msgid "This cannot be undone."
 msgstr "Nebude možné to vrátit zpět."
 
-#: ../src/client/application/geary-controller.vala:2456
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr "Vyprázdnit %s"
 
-#: ../src/client/application/geary-controller.vala:2473
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 msgid "Error emptying %s"
 msgstr "Chyba při vyprazďňování složky %s"
 
-#: ../src/client/application/geary-controller.vala:2503
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Chcete trvale smazat tuto zprávu?"
 msgstr[1] "Chcete trvale smazat tyto zprávy?"
 msgstr[2] "Chcete trvale smazat tyto zprávy?"
 
-#: ../src/client/application/geary-controller.vala:2505
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Smazat"
 
-#: ../src/client/application/geary-controller.vala:2536
+#: ../src/client/application/geary-controller.vala:2522
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Zpět archivace (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2551
+#: ../src/client/application/geary-controller.vala:2537
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Zpět přesunutí do koše (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2604
+#: ../src/client/application/geary-controller.vala:2590
 msgid "Undo (Ctrl+Z)"
 msgstr "Zpět (Ctrl+Z)"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i shoda"
-msgstr[1] "%i shody"
-msgstr[2] "%i shod"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Spustit Geary se skrytým hlavním oknem"
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i shoda (s přechodem přes okraj)"
-msgstr[1] "%i shody (s přechodem přes okraj)"
-msgstr[2] "%i shod (s přechodem přes okraj)"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Vypisovat ladicí informace"
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "nenalezeno"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Zaznamenávat sledování konverzace"
 
-#: ../src/client/components/main-window.vala:430
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Zaznamenávat síťové deserializace"
 
-#: ../src/client/components/search-bar.vala:10
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Hledat"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Zaznamenávat aktivity sítě"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:25
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Prohledat všechny e-maily v účtu podle klíčového slova (Ctrl+S)"
+#. / 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 "Zaznamenávat přehrání fronty IMAP"
 
-#: ../src/client/components/search-bar.vala:118
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indexuje se účet %s"
+#. / 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 "Zaznamenávat síťové serializace"
 
-#: ../src/client/components/search-bar.vala:129
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Prohledat účet %s"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Zaznamenávat opakující se aktivity"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Odesílá se…"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Zaznamenávat databázové dotazy (generuje velké množství zpráv)"
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_Budiž"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Zaznamenávat normalizace složky"
 
-#: ../src/client/components/stock.vala:19
-#: ../ui/edit_alternate_emails.glade.h:3 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Zrušit"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Povolit kontrolu WebView"
 
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Zavřít"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Odvolat všechny serverové certifikáty s varováními TLS"
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Vyřadit"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Zobrazit verzi programu"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Otevřít"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Použít %s k otevření nového okna pro psaní zprávy"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Tisk…"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Připomínky, návrhy a chyby hlaste prosím na:"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Odstranit"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Nepodařilo se zpracovat přepínače příkazového řádku: %s\n"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "Vybrat _vše"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Nerozpoznaný přepínač příkazového řádku „%s“\n"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Zachovat"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s – nové zprávy"
 
-#: ../src/client/composer/composer-widget.vala:73
-msgid "Saved"
-msgstr "Uloženo"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d nová zpráva"
+msgstr[1] "%d nové zprávy"
+msgstr[2] "%d nových zpráv"
 
-#: ../src/client/composer/composer-widget.vala:74
-msgid "Saving"
-msgstr "Ukládá se"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d nová zpráva celkem"
+msgstr[1] "%s, %d nové zprávy celkem"
+msgstr[2] "%s, %d nových zpráv celkem"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "Error saving"
-msgstr "Chyba při ukládání"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d další nová zpráva pro %s)"
+msgstr[1] ""
+"%s\n"
+"(%d další nové zprávy pro %s)"
+msgstr[2] ""
+"%s\n"
+"(%d dalších nových zpráv pro %s)"
 
-#: ../src/client/composer/composer-widget.vala:76
-msgid "Press Backspace to delete quote"
-msgstr "Citaci smažete zmáčknutím Backspace"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Otevřít"
 
-#: ../src/client/composer/composer-widget.vala:77
-msgid "New Message"
-msgstr "Nová zpráva"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Já"
 
-#. A 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:138
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr "Nedůvěryhodné připojení: %s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr "Identitu poštovního serveru %s na %s:%u nelze ověřit."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
 msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
-"příloha|přílohy|příloze|přílohu|přílohou|přiložený|přiložená|přiložené|"
-"přiloženým|přiloženou|přiložit|přikládám|přiložil|přikládá|přikládáme|"
-"přiložili|přiložily"
+"Pokud vyberete „Důvěřovat tomuto serveru“ nebo „Vždy důvěřovat tomuto "
+"serveru“, mohou být vaše uživatelské jméno a heslo odeslány nebezpečným "
+"způsobem."
 
-#: ../src/client/composer/composer-widget.vala:1102
-#: ../src/client/composer/composer-widget.vala:1106
-msgid "Do you want to discard this message?"
-msgstr "Chcete zahodit tuto zprávu?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"Pokud vyberete „Nedůvěřovat tomuto serveru“, nebude Geary k tomuto serveru "
+"vůbec přistupovat."
 
-#: ../src/client/composer/composer-widget.vala:1262
-msgid "Send message with an empty subject and body?"
-msgstr "Poslat zprávu s prázdným předmětem a tělem?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Geary tento poštovní účet nepřidá nebo neaktualizuje."
 
-#: ../src/client/composer/composer-widget.vala:1264
-msgid "Send message with an empty subject?"
-msgstr "Poslat zprávu s prázdným předmětem?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"Pokud vyberete „Nedůvěřovat tomuto serveru“, zastaví Geary přístup k tomuto "
+"účtu."
 
-#: ../src/client/composer/composer-widget.vala:1266
-msgid "Send message with an empty body?"
-msgstr "Poslat zprávu s prázdným tělem?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr "Pokud nemáte žádné další otevřené poštovní účty, bude Geary ukončen."
 
-#: ../src/client/composer/composer-widget.vala:1268
-msgid "Send message without an attachment?"
-msgstr "Poslat zprávu bez přílohy?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Pokud máte k této záležitosti nějaké dotazy, kontaktujte svého správce "
+"systému nebo poskytovatele e-mailu."
 
-#: ../src/client/composer/composer-widget.vala:1530
-msgid "Cannot add attachment"
-msgstr "Nelze připojit přílohu"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr "Certifikát serveru je podepsán neznámou autoritou"
 
-#: ../src/client/composer/composer-widget.vala:1541
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "Soubor „%s“ nebyl nalezen."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr "Identita serveru neodpovídá identitě v certifikátu"
 
-#: ../src/client/composer/composer-widget.vala:1548
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "„%s“ je složka."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Certifikát serveru vypršel"
 
-#: ../src/client/composer/composer-widget.vala:1555
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "Soubor „%s“ je prázdný."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "Certifikát serveru nebyl aktivován"
 
-#: ../src/client/composer/composer-widget.vala:1569
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "Soubor „%s“ nemohl být otevřen pro čtení."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "Certifikát serveru byl odvolán a v současnosti je neplatný"
 
-#: ../src/client/composer/composer-widget.vala:1576
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "Soubor „%s“ už byl pro doručení přiložen."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "Certifikát serveru není považován za bezpečný"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1585
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr "Při zpracování certifikátu serveru nastala chyba"
 
-#: ../src/client/composer/composer-widget.vala:1645
-msgid "To: "
-msgstr "Komu: "
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr "Aby se mohlo pokračovat, potřebuje Geary heslo k vašemu e-mailu"
 
-#: ../src/client/composer/composer-widget.vala:1648
-msgid "Cc: "
-msgstr "Kopie: "
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Vybrat soubor"
 
-#: ../src/client/composer/composer-widget.vala:1651
-msgid "Bcc: "
-msgstr "Skrytá kopie: "
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Příloha"
 
-#: ../src/client/composer/composer-widget.vala:1654
-msgid "Reply-To: "
-msgstr "Odpověď:"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr "Dodatečné adresy pro %s"
 
-#: ../src/client/composer/composer-widget.vala:1887
-msgid "Select Color"
-msgstr "Vybrat barvu"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Účty"
 
-#. 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:2322
-#, c-format
-msgid "%1$s via %2$s"
-msgstr "%1$s přes %2$s"
+#. / 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 "První poslední"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2364
-msgid "_From:"
-msgstr "_Od:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Vítejte v Geary."
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Já"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Nejprve vyplňte informace o svém účtu."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 týdny nazpět"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 měsíc nazpět"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 měsíce nazpět"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 měsíců nazpět"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 rok nazpět"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "2 roky nazpět"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "4 roky nazpět"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Vše"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "Úprava"
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr "Náhled"
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "Pama_tovat si hesla"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "Pama_tovat si heslo"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Nelze ověřit:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Neplatná přezdívka účtu.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; E-mailová adresa už byla do Geary přidána.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Chyba připojení IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Nesprávné uživatelské jméno nebo heslo pro IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Chyba připojení SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; Nesprávné uživatelské jméno nebo heslo pro SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Chyba připojení.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Nesprávné uživatelské jméno nebo heslo.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Uložit"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Přidat"
+
+#. / 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 "%l∶%M %P"
+
+#. / 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 "%b %-e"
+
+#. / 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 "%B %-e, %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 "%B %-e, %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 "%B %-e, %Y %-l∶%M %P"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Nyní"
+
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "Před %d m"
+msgstr[1] "Před %d m"
+msgstr[2] "Před %d m"
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "Před %d h"
+msgstr[1] "Před %d h"
+msgstr[2] "Před %d h"
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Včera"
+
+#. / 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
+msgid "%A"
+msgstr "%A"
+
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "B"
+
+#: ../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/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d zpráva"
+msgstr[1] "%d zprávy"
+msgstr[2] "%d zpráv"
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d nepřečtená"
+msgstr[1] "%d nepřečtené"
+msgstr[2] "%d nepřečtených"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Schránky"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Prohledat účet %s"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d výsledek"
+msgstr[1] "%d výsledky"
+msgstr[2] "%d výsledků"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "Nebyla vybrána žádná konverzace."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "%u vybraná konverzace."
@@ -955,7 +1156,7 @@ msgstr "Žádná konverzace ve složce."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:708
 msgid "This message contains remote images."
-msgstr "Tato zpráva obsahuje vzdálené obrázky. "
+msgstr "Tato zpráva obsahuje vzdálené obrázky."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:708
 msgid "Show Images"
@@ -994,7 +1195,6 @@ msgid "Date:"
 msgstr "Datum:"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "%u přečtená zpráva"
@@ -1002,33 +1202,30 @@ msgstr[1] "%u přečtené zprávy"
 msgstr[2] "%u přečtených zpráv"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr "Tato zpráva byla úspěšně odeslána, ale nelze ji uložit do %s"
 
-#. Add a menu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Kopírovat"
 
-#. Add a menu item for copying the address.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "Kopírovat _e-mailovou adresu"
 
-#. Add a menu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Kopírovat _odkaz"
 
-#. Select message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "Vybrat _zprávu"
 
-#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Vybrat _vše"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "_Kontrolovat"
@@ -1041,7 +1238,6 @@ msgstr "Tento odkaz vypadá, že míří na"
 msgid "but actually goes to"
 msgstr "ale ve skutečnosti jde na"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
 msgstr " (neplatný?)"
@@ -1065,12 +1261,10 @@ msgstr[0] "Uložit pří_lohu…"
 msgstr[1] "Uložit pří_lohy…"
 msgstr[2] "Uložit pří_lohy…"
 
-#. Reply to all on a message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "Odpovědět _všem"
 
-#. Mark as read/unread.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "_Označit jako přečtené"
@@ -1083,1075 +1277,619 @@ msgstr "_Označit jako nepřečtené"
 msgid "Mark Unread From _Here"
 msgstr "Označit jako nepřečtené z_de"
 
-#. Separator.
-#. View original message source.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "_Zobrazit zdroj"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:378
-msgid "none"
-msgstr "žádný"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "Nepodařilo se otevřít výchozí textový editor."
 
 #: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s – Inspektor konverzace"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Vybrat soubor"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Uloženo"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Příloha"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Ukládá se"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
-msgid "Untrusted Connection: %s"
-msgstr "Nedůvěryhodné připojení: %s"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Chyba při ukládání"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
-msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr "Identitu poštovního serveru %s na %s:%u nelze ověřit."
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "Citaci smažete zmáčknutím Backspace"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
-msgid ""
-"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-"your username and password to be transmitted insecurely."
-msgstr ""
-"Pokud vyberete „Důvěřovat tomuto serveru“ nebo „Vždy důvěřovat tomuto "
-"serveru“, mohou být vaše uživatelské jméno a heslo odeslány nebezpečným "
-"způsobem."
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Nová zpráva"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-"server."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Pokud vyberete „Nedůvěřovat tomuto serveru“, nebude Geary k tomuto serveru "
-"vůbec přistupovat."
+"příloha|přílohy|příloze|přílohu|přílohou|přiložený|přiložená|přiložené|přilož"
+"eným|přiloženou|přiložit|přikládám|přiložil|přikládá|přikládáme|přiložili|při"
+"ložily"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
-msgid "Geary will not add or update this email account."
-msgstr "Geary tento poštovní účet nepřidá nebo neaktualizuje."
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Chcete zahodit tuto zprávu?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-"this account."
-msgstr ""
-"Pokud vyberete „Nedůvěřovat tomuto serveru“, zastaví Geary přístup k tomuto "
-"účtu."
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Poslat zprávu s prázdným předmětem a tělem?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr "Pokud nemáte žádné další otevřené poštovní účty, bude Geary ukončen."
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Poslat zprávu s prázdným předmětem?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
-msgid ""
-"Contact your system administrator or email service provider if you have any "
-"question about these issues."
-msgstr ""
-"Pokud máte k této záležitosti nějaké dotazy, kontaktujte svého správce "
-"systému nebo poskytovatele e-mailu."
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Poslat zprávu s prázdným tělem?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
-msgstr "Certifikát serveru je podepsán neznámou autoritou"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Poslat zprávu bez přílohy?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
-msgid "The server's identity does not match the identity in the certificate"
-msgstr "Identita serveru neodpovídá identitě v certifikátu"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Nelze připojit přílohu"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
-msgid "The server's certificate has expired"
-msgstr "Certifikát serveru vypršel"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "Soubor „%s“ nebyl nalezen."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
-msgid "The server's certificate has not been activated"
-msgstr "Certifikát serveru nebyl aktivován"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "„%s“ je složka."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
-msgid "The server's certificate has been revoked and is now invalid"
-msgstr "Certifikát serveru byl odvolán a v současnosti je neplatný"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "Soubor „%s“ je prázdný."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
-msgid "The server's certificate is considered insecure"
-msgstr "Certifikát serveru není považován za bezpečný"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "Soubor „%s“ nemohl být otevřen pro čtení."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
-msgid "An error has occurred processing the server's certificate"
-msgstr "Při zpracování certifikátu serveru nastala chyba"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "Soubor „%s“ už byl pro doručení přiložen."
 
-#. 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 "Geary requires your email password to continue"
-msgstr "Aby se mohlo pokračovat, potřebuje Geary heslo k vašemu e-mailu"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. 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 zpráva"
-msgstr[1] "%d zprávy"
-msgstr[2] "%d zpráv"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Komu: "
 
-#. / 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 nepřečtená"
-msgstr[1] "%d nepřečtené"
-msgstr[2] "%d nepřečtených"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Kopie: "
 
-#. / 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/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Skrytá kopie: "
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Schránky"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "Odpověď: "
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d výsledek"
-msgstr[1] "%d výsledky"
-msgstr[2] "%d výsledků"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Vybrat barvu"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s – nové zprávy"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr "%1$s přes %2$s"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d nová zpráva"
-msgstr[1] "%d nové zprávy"
-msgstr[2] "%d nových zpráv"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_Od:"
 
-#: ../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 nová zpráva celkem"
-msgstr[1] "%s, %d nové zprávy celkem"
-msgstr[2] "%s, %d nových zpráv celkem"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 další nová zpráva pro %s)"
-msgstr[1] ""
-"%s\n"
-"(%d další nové zprávy pro %s)"
-msgstr[2] ""
-"%s\n"
-"(%d dalších nových zpráv pro %s)"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Odesílá se…"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Otevřít"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i shoda"
+msgstr[1] "%i shody"
+msgstr[2] "%i shod"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i shoda (s přechodem přes okraj)"
+msgstr[1] "%i shody (s přechodem přes okraj)"
+msgstr[2] "%i shod (s přechodem přes okraj)"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "nenalezeno"
 
-#. / 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"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_Budiž"
 
-#. / 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 "%b %-e"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Zrušit"
 
-#. / 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"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Zavřít"
 
-#. / 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 "%B %-e, %Y %-l:%M %P"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Vyřadit"
 
-#. / 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"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Otevřít"
 
-#. / 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 "%B %-e, %Y %-l∶%M %P"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Tisk…"
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Nyní"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Odstranit"
 
-#: ../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "Před %d m"
-msgstr[1] "Před %d m"
-msgstr[2] "Před %d m"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Zachovat"
 
-#: ../src/client/util/util-date.vala:171
-#, c-format
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "Před %d h"
-msgstr[1] "Před %d h"
-msgstr[2] "Před %d h"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Prohledat všechny e-maily v účtu podle klíčového slova (Ctrl+S)"
 
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "Včera"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Indexuje se účet %s"
 
-#. / 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"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(bez předmětu)"
+#~ msgid "Geary Mail"
+#~ msgstr "Pošta Geary"
 
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "B"
+#~ msgid "Send and receive email"
+#~ msgstr "Odesílat a přijímat e-maily"
 
-#: ../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "email;e-mail;mail;pošta;e-pošta;"
 
-#: ../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#~ msgid "Compose Message"
+#~ msgstr "Napsat zprávu"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#~ msgid "Send by email"
+#~ msgstr "Odeslat e-mailem"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "kB"
+#~ msgid "Send files using Geary"
+#~ msgstr "Odeslat soubory pomocí aplikace Geary"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#~ msgid "_Donate"
+#~ msgstr "_Darovat"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Nelze odstranit účet</span> "
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Okno nové zprávy spojené s tímto účtem je v současné době otevřeno. Odešlete "
+#~ "nebo zrušte zprávu a zkuste to znovu."
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Jiná"
+#~ msgid "Add account"
+#~ msgstr "Přidat účet"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#~ msgid "Edit account"
+#~ msgstr "Upravit účet"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#~ msgid "Remove account"
+#~ msgstr "Odstranit účet"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Doručená pošta"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Vyčkejte prosím, než Geary ověří váš účet."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Koncepty"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Nedůvěryhodné připojení"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Odeslaná pošta"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "_Vždy důvěřovat tomuto serveru"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "S hvězdičkou"
+#~ msgid "_Trust This Server"
+#~ msgstr "_Důvěřovat tomuto serveru"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Důležité"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "_Nedůvěřovat tomuto serveru"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Všechny zprávy"
+#~ msgid "_Undo"
+#~ msgstr "_Zpět"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Nevyžádaná"
+#~ msgid "_Redo"
+#~ msgstr "Zno_vu"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Koš"
+#~ msgid "Cu_t"
+#~ msgstr "_Vyjmout"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "K odeslání"
+#~ msgid "_Paste"
+#~ msgstr "V_ložit"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Archiv"
+#~ msgid "_Left"
+#~ msgstr "_Vlevo"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-msgstr "Žádný"
+#~ msgid "_Right"
+#~ msgstr "_Vpravo"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-msgid "attachment"
-msgstr "příloha"
+#~ msgid "_Center"
+#~ msgstr "Na _střed"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
-msgstr "skrytá kopie"
+#~ msgid "_Justify"
+#~ msgstr "Do _bloku"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
-msgstr "tělo"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Odkaz (Ctrl+L)"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "cc"
-msgstr "kopie"
+#~ msgid "C_olor"
+#~ msgstr "B_arva"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
-msgstr "od"
+#~ msgid "More options"
+#~ msgstr "Další volby"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-msgid "subject"
-msgstr "předmět"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Citace textu (Ctrl+])"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
-msgstr "komu"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Konec citace textu (Ctrl+[)"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
-msgstr "já"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Odstranit formátování (Ctrl+Space)"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-msgid "Drafts | Draft"
-msgstr ""
-"Drafts | Koncepty | Koncept | Rozepsané | Rozepsané zprávy | Rozepsané e-"
-"maily"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Vložit _s formátováním"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "Sent | Odeslané | Odeslaná pošta  | Odeslané zprávy | Odeslané e-maily"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Tučný (Ctrl+B)"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
-msgstr ""
-"Junk | Spam | Nevyžádané | Nevyžádané zprávy | Nevyžádaná pošta | Nevyžádané "
-"e-maily"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Kurzíva (Ctrl+I)"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Trash | Koš | Smazané | Smazané zprávy | Smazaná pošta"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Podtržené (Ctrl+U)"
 
-#. List of folder names to match for Archive, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
-msgid "Archive | Archives"
-msgstr "Archiv | Archív | Archivy | Archívy | Archive | Archives"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Přeškrtnuté (Ctrl+K)"
 
-#. / 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:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %b %-e, %Y v %-l∶%M %p"
+#~ msgid "_Rich Text"
+#~ msgstr "Fo_rmátovaný text"
 
-#. / 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:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "%2$s napsal %1$s:"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Zobrazit rozšiřující pole"
 
-#. / 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:228
-#, c-format
-msgid "%s wrote:"
-msgstr "%s napsal:"
+#~ msgctxt "Label"
+#~ msgid "Close and Save"
+#~ msgstr "Uložit a zavřít"
 
-#. / 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:234
-#, c-format
-msgid "On %s:"
-msgstr "%s:"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "Uložit a zavřít"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Přeposlaná zpráva ----------"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "Uložit a zavřít"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "Od: %s\n"
+#~ msgctxt "Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Zahodit a zavřít"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Předmět: %s\n"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Zahodit a zavřít"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "Datum: %s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "Zahodit a zavřít"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "Komu: %s\n"
+#~ msgid "Lar_ge"
+#~ msgstr "Vel_ké"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Kopie: %s\n"
+#~ msgid "Large"
+#~ msgstr "Velké"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">Nelze odstranit účet</span>"
+#~ msgid "_Medium"
+#~ msgstr "_Střední"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Okno nové zprávy spojené s tímto účtem je v současné době otevřeno. Odešlete "
-"nebo zrušte zprávu a zkuste to znovu."
+#~ msgid "Medium"
+#~ msgstr "Střední"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Přidat účet"
+#~ msgid "_Small"
+#~ msgstr "_Malé"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Upravit účet"
+#~ msgid "Small"
+#~ msgstr "Malé"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Odstranit účet"
+#~ msgid "S_ans Serif"
+#~ msgstr "B_ezpatkové"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Vyčkejte prosím, než Geary ověří váš účet."
+#~ msgid "Sans Serif"
+#~ msgstr "Bezpatkové (sans serif)"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Nedůvěryhodné připojení"
+#~ msgid "S_erif"
+#~ msgstr "P_atkové"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "_Vždy důvěřovat tomuto serveru"
+#~ msgid "Serif"
+#~ msgstr "Patkové (serif)"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "_Důvěřovat tomuto serveru"
+#~ msgid "_Fixed Width"
+#~ msgstr "_Pevná šířka"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "_Nedůvěřovat tomuto serveru"
+#~ msgid "Fixed Width"
+#~ msgstr "Pevná šířka"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Zpět"
-
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "Zno_vu"
-
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "_Vyjmout"
-
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "V_ložit"
-
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Vlevo"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Vpravo"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "Na _střed"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "Do _bloku"
-
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Odkaz (Ctrl+L)"
-
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "B_arva"
-
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Další volby"
-
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Citace textu (Ctrl+])"
-
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Konec citace textu (Ctrl+[)"
-
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Odstranit formátování (Ctrl+Space)"
-
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Vložit _s formátováním"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Tučný (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Kurzíva (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Podtržené (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Přeškrtnuté (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "Fo_rmátovaný text"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Zobrazit rozšiřující pole"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "Uložit a zavřít"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "Uložit a zavřít"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "Uložit a zavřít"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "Zahodit a zavřít"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "Zahodit a zavřít"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "Zahodit a zavřít"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "Vel_ké"
-
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "Velké"
-
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "_Střední"
-
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "Střední"
-
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "_Malé"
-
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "Malé"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "B_ezpatkové"
-
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "Bezpatkové (sans serif)"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "P_atkové"
-
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "Patkové (serif)"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "_Pevná šířka"
-
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "Pevná šířka"
-
-#: ../ui/composer.glade.h:42
-msgid "Detach"
-msgstr "Odpojit"
-
-#: ../ui/composer.glade.h:43
-msgid "Detach (Ctrl+D)"
-msgstr "Odpojit (Ctrl+D)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_Odeslat"
-
-#: ../ui/composer.glade.h:45
-msgid "Send"
-msgstr "Odeslat"
-
-#: ../ui/composer.glade.h:46
-msgid "Send (Ctrl+Enter)"
-msgstr "Odeslat (Ctrl+Enter)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "_Přiložit soubor"
-
-#: ../ui/composer.glade.h:48
-msgid "Attach File"
-msgstr "Přiložit soubor"
-
-#: ../ui/composer.glade.h:49
-msgid "_Include Original Attachments"
-msgstr "Vlož_it původní přílohy"
-
-#: ../ui/composer.glade.h:50
-msgid "Include Original Attachments"
-msgstr "Vložit původní přílohy"
-
-#: ../ui/composer.glade.h:51
-msgid "Application Menu"
-msgstr "Aplikační nabídka"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:53
-msgid "_To"
-msgstr "_Komu"
+#~ msgid "Detach"
+#~ msgstr "Odpojit"
 
-#: ../ui/composer.glade.h:54
-msgid "_Cc"
-msgstr "Ko_pie"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Odpojit (Ctrl+D)"
 
-#: ../ui/composer.glade.h:55
-msgid "_Subject"
-msgstr "_Předmět"
+#~ msgid "_Send"
+#~ msgstr "_Odeslat"
 
-#: ../ui/composer.glade.h:56
-msgid "_Bcc"
-msgstr "_Skrytá kopie"
+#~ msgid "Send"
+#~ msgstr "Odeslat"
 
-#: ../ui/composer.glade.h:57
-msgid "_Reply-To"
-msgstr "_Odpověď"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Odeslat (Ctrl+Enter)"
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:59
-msgid "From"
-msgstr "Od"
+#~ msgid "_Attach File"
+#~ msgstr "_Přiložit soubor"
 
-#: ../ui/composer.glade.h:60
-msgid "Drop files here"
-msgstr "upusťte soubory zde"
+#~ msgid "Attach File"
+#~ msgstr "Přiložit soubor"
 
-#: ../ui/composer.glade.h:61
-msgid "To add them as attachments"
-msgstr "Chcete-li je přidat jako přílohy"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "Vlož_it původní přílohy"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-msgid "Remove email address"
-msgstr "Odebrat e-mailové adresy"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Vložit původní přílohy"
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"Některé e-mailové služby potřebují, aby byly na serveru nastaveny dodatečné "
-"adresy. Kontaktujte svého poskytovatele e-mailu ohledně více informací."
+#~ msgid "Application Menu"
+#~ msgstr "Aplikační nabídka"
 
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "Akt_ualizovat"
+#~ msgid "_To"
+#~ msgstr "_Komu"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Hledat:"
+#~ msgid "_Cc"
+#~ msgstr "Ko_pie"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Předchozí"
+#~ msgid "_Subject"
+#~ msgstr "_Předmět"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Následující"
+#~ msgid "_Bcc"
+#~ msgstr "_Skrytá kopie"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Rozlišovat velikost písmen"
+#~ msgid "_Reply-To"
+#~ msgstr "_Odpověď"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "štítek"
+#~ msgid "From"
+#~ msgstr "Od"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Heslo"
+#~ msgid "Drop files here"
+#~ msgstr "upusťte soubory zde"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "E-_mailová adresa"
+#~ msgid "To add them as attachments"
+#~ msgstr "Chcete-li je přidat jako přílohy"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Heslo"
+#~ msgid "Remove email address"
+#~ msgstr "Odebrat e-mailové adresy"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "S_lužba"
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "Některé e-mailové služby potřebují, aby byly na serveru nastaveny dodatečné "
+#~ "adresy. Kontaktujte svého poskytovatele e-mailu ohledně více informací."
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "J_méno"
+#~ msgid "_Update"
+#~ msgstr "Akt_ualizovat"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "Přez_dívka"
+#~ msgid "Find:"
+#~ msgstr "Hledat:"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Do práce, domů, atd."
+#~ msgid "_Previous"
+#~ msgstr "_Předchozí"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_Ukládat odeslanou poštu"
+#~ msgid "_Next"
+#~ msgstr "_Následující"
 
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
-msgstr "Doda_tečné e-mailové adresy…"
+#~ msgid "_Case sensitive"
+#~ msgstr "_Rozlišovat velikost písmen"
 
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "Nastavení IMAP"
+#~ msgid "label"
+#~ msgstr "štítek"
 
-#: ../ui/login.glade.h:12
-msgid "Se_rver"
-msgstr "Se_rver"
+#~ msgid "Password"
+#~ msgstr "Heslo"
 
-#: ../ui/login.glade.h:13
-msgid "P_ort"
-msgstr "P_ort"
+#~ msgid "E_mail address"
+#~ msgstr "E-_mailová adresa"
 
-#: ../ui/login.glade.h:14
-msgid "Ser_ver"
-msgstr "Ser_ver"
+#~ msgid "_Password"
+#~ msgstr "_Heslo"
 
-#: ../ui/login.glade.h:15
-msgid "Por_t"
-msgstr "Por_t"
+#~ msgid "S_ervice"
+#~ msgstr "S_lužba"
 
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "Nastavení SMTP"
+#~ msgid "N_ame"
+#~ msgstr "J_méno"
 
-#: ../ui/login.glade.h:17
-msgid "User_name"
-msgstr "Uživatelské _jméno"
+#~ msgid "N_ickname"
+#~ msgstr "Přez_dívka"
 
-#: ../ui/login.glade.h:18
-msgid "Pass_word"
-msgstr "Hes_lo"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Do práce, domů, atd."
 
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr "Uživatelské jméno pro SMTP"
+#~ msgid "_Save sent mail"
+#~ msgstr "_Ukládat odeslanou poštu"
 
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr "Heslo pro SMTP"
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "Doda_tečné e-mailové adresy…"
 
-#: ../ui/login.glade.h:21
-msgid "_Username"
-msgstr "_Uživatelské jméno"
+#~ msgid "IMAP settings"
+#~ msgstr "Nastavení IMAP"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr "Uživatelské jméno pro IMAP"
+#~ msgid "Se_rver"
+#~ msgstr "Se_rver"
 
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr "Heslo pro IMAP"
+#~ msgid "P_ort"
+#~ msgstr "P_ort"
 
-#: ../ui/login.glade.h:24
-msgid "Encr_yption"
-msgstr "Ši_frování"
+#~ msgid "Ser_ver"
+#~ msgstr "Ser_ver"
 
-#: ../ui/login.glade.h:25
-msgid "Encrypt_ion"
-msgstr "Š_ifrování"
+#~ msgid "Por_t"
+#~ msgstr "Por_t"
 
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "SMTP settings"
+#~ msgstr "Nastavení SMTP"
 
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "User_name"
+#~ msgstr "Uživatelské _jméno"
 
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "Ne_vyžaduje ověření"
+#~ msgid "Pass_word"
+#~ msgstr "Hes_lo"
 
-#: ../ui/login.glade.h:30
-msgid "Use IMAP cre_dentials"
-msgstr "Použít přihlašovací ú_daje IMAP"
+#~ msgid "SMTP username"
+#~ msgstr "Uživatelské jméno pro SMTP"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Editor"
+#~ msgid "SMTP password"
+#~ msgstr "Heslo pro SMTP"
 
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr "Ukládat kon_cepty na server"
+#~ msgid "_Username"
+#~ msgstr "_Uživatelské jméno"
 
-#: ../ui/login.glade.h:33
-msgid "Si_gn emails (HTML allowed):"
-msgstr "Patička e-_mailů (HTML povoleno):"
+#~ msgid "IMAP username"
+#~ msgstr "Uživatelské jméno pro IMAP"
 
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "Úložiště"
+#~ msgid "IMAP password"
+#~ msgstr "Heslo pro IMAP"
 
-#: ../ui/login.glade.h:35
-msgid "_Download mail"
-msgstr "Stá_hnout e-mail"
+#~ msgid "Encr_yption"
+#~ msgstr "Ši_frování"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "Přihlašovací údaje SMTP"
+#~ msgid "Encrypt_ion"
+#~ msgstr "Š_ifrování"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "Uživatelské jméno"
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Pamatovat si heslo"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Ověřit"
+#~ msgid "No authentication re_quired"
+#~ msgstr "Ne_vyžaduje ověření"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Čtení"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Použít přihlašovací ú_daje IMAP"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "_Automaticky vybrat další zprávu"
+#~ msgid "Composer"
+#~ msgstr "Editor"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "_Zobrazit náhled konverzace"
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Ukládat kon_cepty na server"
 
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr "Používat panel se s_tromovým zobrazením"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "Patička e-_mailů (HTML povoleno):"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "Zapnout _kontrolu pravopisu"
+#~ msgid "Storage"
+#~ msgstr "Úložiště"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "Upozornění"
+#~ msgid "_Download mail"
+#~ msgstr "Stá_hnout e-mail"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "_Přehrávat zvuková upozornění"
+#~ msgid "SMTP Credentials"
+#~ msgstr "Přihlašovací údaje SMTP"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "Zobrazit _upozornění na nový e-mail"
+#~ msgid "Username"
+#~ msgstr "Uživatelské jméno"
 
-#: ../ui/preferences.glade.h:10
-msgid "Always _watch for new mail"
-msgstr "_Vždy sledovat novou poštu"
+#~ msgid "_Remember password"
+#~ msgstr "_Pamatovat si heslo"
 
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr "Geary poběží na pozadí a bude oznamovat příchod nové pošty"
+#~ msgid "_Authenticate"
+#~ msgstr "_Ověřit"
 
-#: ../ui/preferences.glade.h:12
-msgid "Preferences"
-msgstr "Předvolby"
+#~ msgid "Reading"
+#~ msgstr "Čtení"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Opravdu chcete odstranit tento účet?</"
-"span>"
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Automaticky vybrat další zprávu"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Všechny e-maily spojené s tímto účtem budou odstraněny z vašeho počítače. "
-"Neovlivní to ale e-maily na serveru."
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Zobrazit náhled konverzace"
+
+#~ msgid "Use _three pane view"
+#~ msgstr "Používat panel se s_tromovým zobrazením"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Zapnout _kontrolu pravopisu"
+
+#~ msgid "Notifications"
+#~ msgstr "Upozornění"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Přehrávat zvuková upozornění"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Zobrazit _upozornění na nový e-mail"
+
+#~ msgid "Always _watch for new mail"
+#~ msgstr "_Vždy sledovat novou poštu"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr "Geary poběží na pozadí a bude oznamovat příchod nové pošty"
+
+#~ msgid "Preferences"
+#~ msgstr "Předvolby"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Opravdu chcete odstranit tento "
+#~ "účet?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Všechny e-maily spojené s tímto účtem budou odstraněny z vašeho počítače. "
+#~ "Neovlivní to ale e-maily na serveru."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Přezdívka:"
+#~ msgid "Nickname:"
+#~ msgstr "Přezdívka:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "E-mailová adresa:"
+#~ msgid "Email address:"
+#~ msgstr "E-mailová adresa:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Probíhá aktualizace aplikace Geary…"
+#~ msgid "Geary update in progress…"
+#~ msgstr "Probíhá aktualizace aplikace Geary…"
diff --git a/po/da.po b/po/da.po
index 539c705..5aa72fc 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,523 +10,507 @@ 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-21 14:10+0000\n"
-"Last-Translator: Nikolaj64 <nikolajholmquist gmail com>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/geary/language/";
-"da/)\n"
-"Language: da\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 00:59+0000\n"
+"Last-Translator: Nikolaj64 <Unknown>\n"
+"Language-Team: Danish "
+"(http://www.transifex.com/projects/p/geary/language/da/)\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"
-
-#: ../../src/client/accounts/add-edit-page.vala:641
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Forbindelsesfejl.\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:53+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: da\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:624
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "&#8226; Email-adressen er allerede tilføjet til Geary\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:628
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP-forbindelsesfejl.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:631
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; Forkert brugernavn eller adgangskode til IMAP.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:621
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Ugyldigt kaldenavn til bruger.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:634
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP-forbindelsesfejl.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; Forkert brugernavn eller adgangskode til SMTP.\n"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Indbakke"
 
-#: ../../src/client/accounts/add-edit-page.vala:645
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Forkert brugernavn eller adgangskode.\n"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Kladder"
 
-#: ../../src/client/views/conversation-viewer.vala:1203
-msgid " (Invalid?)"
-msgstr "(Ugyldig?)"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Sendt mail"
 
-#: ../../src/client/composer/composer-window.vala:972
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" er allerede vedhæftet."
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Stjernet"
 
-#: ../../src/client/composer/composer-window.vala:937
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "\"%s\" blev ikke fundet."
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Vigtig"
 
-#: ../../src/client/composer/composer-window.vala:965
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "\"%s\" kunne ikke åbnes til læsning."
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Al mail"
 
-#: ../../src/client/composer/composer-window.vala:944
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" er en mappe."
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Spam"
 
-#: ../../src/client/composer/composer-window.vala:951
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" er en tom fil."
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Papirkurv"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Udbakke"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Søg"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Arkiv"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Ingen"
 
-#. / 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"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr ""
 
-#. / 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 den %-e. %b %Y, klokken %H:%M %p"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] "%d besked"
-msgstr[1] "%d beskeder"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d ny besked"
-msgstr[1] "%d nye beskeder"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:43
-#, c-format
-msgid "%d results"
-msgstr "%d resultater"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Andet"
 
-#. / 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 ulæst"
-msgstr[1] "%d ulæste"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr ""
 
-#: ../../src/client/util/util-date.vala:170
-#, c-format
-msgid "%dh ago"
-msgstr "%dt siden"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr ""
 
-#: ../../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgstr "%dm siden"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:222
-#, c-format
-msgid "%i matches"
-msgstr "%i matchede"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:224
-#, c-format
-msgid "%i matches (wrapped)"
-msgstr "%i matchede (ombrudt)"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr ""
 
-#. / 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"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr ""
 
-#. / 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"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:107
-#, 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 anen ny beksed for %s)"
-msgstr[1] ""
-"%s\n"
-"(%d andre nye beskeder for %s)"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr ""
 
-#. / 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)"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(intet emne)"
 
-#: ../../src/client/views/conversation-web-view.vala:289
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - Samtaleundersøger"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a den %-e. %b %Y, klokken %H:%M %p"
 
-#: ../../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Nye beskeder"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "%2$s skrev den %1$s:"
 
 #. / 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
+#: ../src/engine/rfc822/rfc822-utils.vala:228
 msgid "%s wrote:"
 msgstr "%s skrev:"
 
-#: ../../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 ny besked i alt"
-msgstr[1] "%s, %d nye beskeder i alt"
+#. / 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:234
+msgid "On %s:"
+msgstr "Den %s:"
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Videresendt besked ----------"
 
-#: ../../src/client/views/conversation-viewer.vala:246
-#, c-format
-msgid "%u conversations selected."
-msgstr "%u samtaler valgt."
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Fra: %s\n"
 
-#: ../../src/client/views/conversation-viewer.vala:743
-#, c-format
-msgid "%u read messages"
-msgstr "%u læste beskeder"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Emne: %s\n"
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Dato: %s\n"
 
-#: ../../src/client/util/util-email.vala:30
-msgid "(no subject)"
-msgstr "(intet emne)"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Til: %s\n"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Videresendt besked ----------"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "CC: %s\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:211
-msgid "1 month back"
-msgstr "1 måned siden"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "intet"
 
-#: ../../src/client/accounts/add-edit-page.vala:214
-msgid "1 year back"
-msgstr "1 år siden"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Mailklient"
 
-#: ../../src/client/accounts/add-edit-page.vala:210
-msgid "2 weeks back"
-msgstr "2 uger siden"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:212
-msgid "3 months back"
-msgstr "3 måneder siden"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Besøg Yorbas hjemmeside"
 
-#: ../../src/client/accounts/add-edit-page.vala:213
-msgid "6 months back"
-msgstr "6 måneder siden"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
+#: ../src/client/application/geary-controller.vala:62
+msgid "Delete conversation (Shift+Delete)"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Er du sikker på, at du vil fjerne "
-"denne konto?</span> "
 
-#: ../../ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">Kan ikke fjerne konto</span>"
+#: ../src/client/application/geary-controller.vala:63
+msgid "Delete conversations (Shift+Delete)"
+msgstr ""
 
-#: ../../ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr ""
-"Et beskedskrivningsvindue associéret med denne bruger er i forvejen åbent."
-"Send eller kassér beskeden og prøv igen."
 
-#: ../../src/client/geary-controller.vala:1491
-#, c-format
-msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr "Filen \"%s\" findes allerede. Vil du erstatte den?"
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:245
-msgid "A_ccounts"
-msgstr "_Konti"
+#: ../src/client/application/geary-controller.vala:72
+msgid "_Archive"
+msgstr "_Arkivér"
 
-#: ../../src/client/geary-controller.vala:1227
-#, c-format
-msgid "About %s"
-msgstr "Om %s"
+#: ../src/client/application/geary-controller.vala:73
+msgid "Archive conversation (A)"
+msgstr ""
 
-#: ../../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Konti"
+#: ../src/client/application/geary-controller.vala:74
+msgid "Archive conversations (A)"
+msgstr ""
 
-#: ../../ui/account_list.glade:71
-msgid "Add account"
-msgstr "Tilføj konto"
+#: ../src/client/application/geary-controller.vala:77
+msgid "Mark as S_pam"
+msgstr "Markér som s_pam"
 
-#: ../../src/client/geary-controller.vala:304
-msgid "Add label"
-msgstr "Tilføj etiket"
+#: ../src/client/application/geary-controller.vala:78
+msgid "Mark as not S_pam"
+msgstr "Marker som ikke s_pam"
+
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
+msgid "Mark conversation"
+msgstr "Markér samtale"
 
-#: ../../src/client/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:81
+msgid "Mark conversations"
+msgstr "Markér samtaler"
+
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Tilføj label til samtale"
 
-#: ../../src/client/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Tilføj label til samtaler"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Al mail"
-
-#: ../../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 ""
-"Al email, der tilhører denne konto vil blive fjernet fra din computer. Dette "
-"vil ikke fjerne emailen på serveren."
-
-#: ../../src/client/geary-args.vala:24
-msgid "Allow inspection of WebView"
-msgstr "Aktiver undersøgelse af web-visning"
-
-#: ../../src/client/views/conversation-viewer.vala:509
-msgid "Always Show From Sender"
-msgstr "Vis altid fra denne afsender"
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
+msgid "Move conversation"
+msgstr "Flyt samtale"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Arkiv"
+#: ../src/client/application/geary-controller.vala:85
+msgid "Move conversations"
+msgstr "Flyt samtaler"
 
-#: ../../src/client/geary-controller.vala:48
-msgid "Archive conversation (Delete, Backspace, A)"
-msgstr "Arkivér samtale (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:372
+msgid "A_ccounts"
+msgstr "_Konti"
 
-#: ../../src/client/geary-controller.vala:49
-msgid "Archive conversations (Delete, Backspace, A)"
-msgstr "Arkivér samtaler (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:377
+#: ../src/client/components/stock.vala:27
+msgid "_Preferences"
+msgstr "_Indstillinger"
 
-#: ../../src/client/geary-controller.vala:1477
-#, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr "Er du sikker på, at du vil åbne \"%s\"?"
+#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/components/stock.vala:25
+msgid "_Help"
+msgstr "_Hjælp"
 
-#: ../../src/client/geary-controller.vala:1478
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
-msgstr ""
-"Vedhæftede filer kan skade dit system, når de åbnes.  Åbn kun filer fra "
-"folk, du stoler på."
+#: ../src/client/application/geary-controller.vala:385
+#: ../src/client/components/stock.vala:21
+msgid "_About"
+msgstr "_Om"
 
-#: ../../src/client/views/conversation-viewer.vala:614
-msgid "Bcc:"
-msgstr "Bcc:"
+#: ../src/client/application/geary-controller.vala:389
+#: ../src/client/components/stock.vala:29
+msgid "_Quit"
+msgstr "Af_slut"
 
-#: ../../ui/composer.glade:113
-msgid "Bold (Ctrl+B)"
-msgstr "Fed (Ctrl+B)"
+#: ../src/client/application/geary-controller.vala:394
+msgid "_Mark as..."
+msgstr "_Markér som..."
 
-#: ../../ui/composer.glade:69
-msgid "C_olor"
-msgstr "F_arve"
+#: ../src/client/application/geary-controller.vala:400
+msgid "Mark as _Read"
+msgstr "Markér som _læst"
 
-#: ../../src/client/composer/composer-window.vala:926
-msgid "Cannot add attachment"
-msgstr "Kan ikke tilføje filen"
+#: ../src/client/application/geary-controller.vala:406
+msgid "Mark as _Unread"
+msgstr "Markér som _ulæst"
 
-#: ../../src/client/views/conversation-viewer.vala:611
-msgid "Cc:"
-msgstr "Cc:"
+#: ../src/client/application/geary-controller.vala:412
+msgid "_Star"
+msgstr "St_jern"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
-msgstr "CC: %s\n"
+#: ../src/client/application/geary-controller.vala:417
+msgid "U_nstar"
+msgstr "Stjern ikke"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Vælg en fil"
+#: ../src/client/application/geary-controller.vala:427
+msgid "Add label"
+msgstr "Tilføj etiket"
 
-#: ../../src/client/geary-controller.vala:553
-msgid "Co_ntinue"
-msgstr "F_ortsæt"
+#: ../src/client/application/geary-controller.vala:428
+msgid "_Label"
+msgstr "_Etiket"
 
-#: ../../src/client/geary-application.vala:29
-msgid "Compose Message"
-msgstr "Skriv besked"
+#: ../src/client/application/geary-controller.vala:432
+msgid "_Move"
+msgstr "_Flyt"
 
-#: ../../src/client/geary-controller.vala:313
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Skriv ny besked (Ctrl+N, N)"
 
-#: ../../ui/preferences.glade:117
-msgid "Composer"
-msgstr "Beskedskriver"
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
+msgid "_Reply"
+msgstr "_Svar"
 
-#: ../../src/client/views/conversation-viewer.vala:897
-msgid "Copy _Email Address"
-msgstr "Kopiér _email-adresse"
+#: ../src/client/application/geary-controller.vala:441
+msgid "Reply (Ctrl+R, R)"
+msgstr "Svar (Ctrl+R, R)"
 
-#: ../../src/client/views/conversation-viewer.vala:902
-msgid "Copy _Link"
-msgstr "Kopiér _link"
+#: ../src/client/application/geary-controller.vala:445
+msgid "R_eply All"
+msgstr "S_var til alle"
 
-#: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr "Copyright 2011-2013 Yorba Foundation"
+#: ../src/client/application/geary-controller.vala:446
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+msgstr "Svar til alle (Ctrl+Skift+R, Skift+R)"
 
-#: ../../ui/composer.glade:21
-msgid "Cu_t"
-msgstr "_Klip"
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
+msgid "_Forward"
+msgstr "_Videresend"
 
-#: ../../src/client/views/conversation-viewer.vala:620
-msgid "Date:"
-msgstr "Dato:"
+#: ../src/client/application/geary-controller.vala:452
+msgid "Forward (Ctrl+L, F)"
+msgstr "Videresend (Ctrl+L, F)"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "Dato: %s\n"
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:43
-msgid "Delete conversation (Delete, Backspace, A)"
-msgstr "Slet samtale (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:44
-msgid "Delete conversations (Delete, Backspace, A)"
-msgstr "Slet samtaler (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:25
-msgid "Display program version"
-msgstr "Vis programversion"
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:663
-msgid "Do you want to discard the unsaved message?"
-msgstr "Vil du kassére denne ugemte besked?"
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:666
-msgid "Do you want to discard this message?"
-msgstr "Ønsker du at kassére denne besked?"
+#: ../src/client/application/geary-controller.vala:746
+msgid "Unable to store server trust exception"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:1479
-msgid "Don't _ask me again"
-msgstr "S_pørg mig ikke igen"
+#: ../src/client/application/geary-controller.vala:983
+msgid "Your settings are insecure"
+msgstr "Dine indstillinger er usikre"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Kladder"
+#: ../src/client/application/geary-controller.vala:984
+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 ""
+"Dine IMAP- og/eller SMTP-indstillinger anvender ikke SSL eller TLS. Dette "
+"betyder, at dit brugernavn og din adgangskode kan læses af andre på "
+"netværket. Er du sikker på, at du vil gære dette?"
 
-#: ../../ui/composer.glade:419
-msgid "Drop files here"
-msgstr "Flyt filer hertil."
+#: ../src/client/application/geary-controller.vala:985
+msgid "Co_ntinue"
+msgstr "F_ortsæt"
 
-#: ../../ui/login.glade:115
-msgid "E_mail address:"
-msgstr "Email-adresse:"
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/components/status-bar.vala:29
+msgid "Error sending email"
+msgstr "Der opstod en fejl ved afsendelse af email"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "E_xit"
-msgstr "_Afslut"
+#: ../src/client/application/geary-controller.vala:1064
+msgid ""
+"Geary encountered an error sending an email.  If the problem persists, "
+"please manually delete the email from your Outbox folder."
+msgstr ""
+"Geary stødte ind i en fejl under afsendelse af en email. Hvis dette problem "
+"fortsætter, bør du manuelt slette beskeden fra din \"Udbakke\"-mappe."
 
-#: ../../src/client/views/conversation-viewer.vala:533
-msgid "Edit Draft"
-msgstr "Redigér kladde"
+#: ../src/client/application/geary-controller.vala:1068
+#: ../src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
+msgstr ""
 
-#: ../../ui/account_list.glade:84
-msgid "Edit account"
-msgstr "Redigér konto"
+#: ../src/client/application/geary-controller.vala:1069
+msgid ""
+"Geary encountered an error saving a sent message to Sent Mail.  The message "
+"will stay in your Outbox folder until you delete it."
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:94
-msgid "Email address:"
-msgstr "Emailadresse:"
+#: ../src/client/application/geary-controller.vala:1138
+msgid "Labels"
+msgstr "Etiketter"
 
-#: ../../src/client/geary-application.vala:28
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Mail;Post;"
+#: ../src/client/application/geary-controller.vala:1150
+msgid "Unable to open the database for %s"
+msgstr "Kunne ikke åbne databasen for %s"
 
-#: ../../ui/preferences.glade:131
-msgid "Enable _spell checking"
-msgstr "Aktiver _stavekontrol"
+#: ../src/client/application/geary-controller.vala:1151
+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 ""
+"Der opstod en felj under åbningen af den lokale maildatabase til denne "
+"konto. Dette sker sikkert på grund af, at databasefilen er beskadiget\n"
+"\n"
+"%s\n"
+"\n"
+"Geary kan genopbygge databasefilen og synkronisére med serveren igen eller "
+"afslutte.\n"
+"\n"
+"Genopbygning af databasen vil slette al lokal email og dets vedhæftede "
+"filer. <b>Mail'en på serveren vil ikke blive rørt.</b>"
 
-#: ../../ui/login.glade:588
-msgid "Encr_yption:"
-msgstr "Kr_yptering:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "_Rebuild"
+msgstr "_Genopbyg"
 
-#: ../../ui/login.glade:607
-msgid "Encrypt_ion:"
-msgstr "Krypter_ing:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "E_xit"
+msgstr "_Afslut"
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-msgid "Enter your account information to get started."
-msgstr "Indtast kontoinformation for at starte."
+#: ../src/client/application/geary-controller.vala:1162
+msgid "Unable to rebuild database for \"%s\""
+msgstr "Kunne ikke genopbygge databasen for \"%s\""
 
-#: ../../src/client/geary-controller.vala:714
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -536,1017 +520,1263 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../src/client/composer/composer-window.vala:43
-msgid "Error saving"
-msgstr "Der opstod en fejl under lagring"
-
-#. / 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 "Der opstod en fejl ved afsendelse af email"
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
+msgid "Unable to open local mailbox for %s"
+msgstr "Kunne ikke åbne den lokale postkasse for %s"
 
-#: ../../src/client/accounts/add-edit-page.vala:216
-msgid "Everything"
-msgstr "Alt"
+#: ../src/client/application/geary-controller.vala:1186
+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 ""
+"Der opstod en fejl under åbningen af den lokale maildatabase til denne "
+"konto. Dette sker sikkert på grund af problemer med filtilladelser.\n"
+"\n"
+"Tjek, at di har læsnings- og skrivningstilladelser for alle filer i denne "
+"mappe.\n"
+"\n"
+"%s"
 
-#: ../../src/client/views/conversation-viewer.vala:1897
-msgid "Failed to open default text editor."
-msgstr "Kunne ikke åbne standardprogrammet til tekstredigéring."
+#: ../src/client/application/geary-controller.vala:1196
+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 ""
+"Den lokale maildatabases versionsnummer er til en nyere version af Geary. "
+"Desværre kan databasen ikke blive \"rullet tilbage\", så den virker med "
+"denne version of Geary.\n"
+"\n"
+"Installér venligst den nyeste version af Geary og prøv igen."
 
-#: ../../src/client/geary-args.vala:54
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Kunne ikke genkende indstillingerne på kommandolinjen: %s\n"
+#: ../src/client/application/geary-controller.vala:1207
+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 ""
+"Der opstod en felj under åbning af den lokele konto. Dette sker sikkert på "
+"grund af forbindelsesproblemer.\n"
+"\n"
+"Tjek, at din internetforbindelse virker og genstart derefter Geary."
 
-#. / 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 "Først Sidst"
+#: ../src/client/application/geary-controller.vala:1715
+msgid "About %s"
+msgstr "Om %s"
 
-#: ../../ui/composer.glade:182
-msgid "Fixed Width"
-msgstr "Fast bredde"
+#. / 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-controller.vala:1718
+msgid "translator-credits"
+msgstr ""
+"Nikolaj Holmquist Pedersen <nikolajholmquist gmail com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Nikolaj64 https://launchpad.net/~nikolajholmquist";
 
-#: ../../src/client/geary-controller.vala:329
-msgid "Forward (Ctrl+L, F)"
-msgstr "Videresend (Ctrl+L, F)"
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:605
-msgid "From:"
-msgstr "Fra:"
+#: ../src/client/application/geary-controller.vala:1986
+msgid "Are you sure you want to open \"%s\"?"
+msgstr "Er du sikker på, at du vil åbne \"%s\"?"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "Fra: %s\n"
+#: ../src/client/application/geary-controller.vala:1987
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
+"Vedhæftede filer kan skade dit system, når de åbnes.  Åbn kun filer fra "
+"folk, du stoler på."
 
-#: ../../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#: ../src/client/application/geary-controller.vala:1988
+msgid "Don't _ask me again"
+msgstr "S_pørg mig ikke igen"
 
-#: ../../src/client/geary-application.vala:25
-msgid "Geary Mail"
-msgstr "Geary mail"
+#: ../src/client/application/geary-controller.vala:2006
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr "Filen \"%s\" findes allerede. Vil du erstatte den?"
 
-#: ../../src/client/geary-controller.vala:626
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
-"Geary stødte ind i en fejl under afsendelse af en email. Hvis dette problem "
-"fortsætter, bør du manuelt slette beskeden fra din \"Udbakke\"-mappe."
+"Filen findes allerede i \"%s\". Hvis du erstatter den, overskrives dens "
+"indhold."
 
-#: ../../ui/password-dialog.glade:315
-msgid "General"
-msgstr "Generelt"
+#: ../src/client/application/geary-controller.vala:2011
+msgid "_Replace"
+msgstr "_Erstat"
 
-#: ../../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/client/application/geary-controller.vala:2309
+msgid "Close open draft messages?"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:133
-msgid "IMAP Credentials"
-msgstr "IMAP-legitimationsoplysninger"
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
 
-#: ../../ui/login.glade:572
-msgid "IMAP password"
-msgstr "IMAP-adgangskode"
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
 
-#: ../../ui/login.glade:286 ../../ui/password-dialog.glade:334
-msgid "IMAP settings"
-msgstr "IMAP-indstillinger"
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
+msgstr ""
 
-#: ../../ui/login.glade:556
-msgid "IMAP username"
-msgstr "IMAP-brugernavn"
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Vigtig"
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Indbakke"
+#: ../src/client/application/geary-controller.vala:2489
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Indbakker"
+#: ../src/client/application/geary-controller.vala:2491
+msgid "Delete"
+msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:163
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indeksérer %s konto"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
+msgstr ""
 
-#: ../../ui/composer.glade:120
-msgid "Italic (Ctrl+I)"
-msgstr "Kursiv (Ctrl+I)"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:689
-msgid "Labels"
-msgstr "Etiketter"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr ""
+
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Vis fejlretningsinformation"
 
-#: ../../ui/composer.glade:151
-msgid "Lar_ge"
-msgstr "_Stor"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Logfør samtaleovervågning"
 
-#: ../../ui/composer.glade:152
-msgid "Large"
-msgstr "Stor"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Logfør netværksdeserialisering"
 
-#: ../../ui/composer.glade:62
-msgid "Link (Ctrl+L)"
-msgstr "Link (Ctrl+L)"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Logfør netværksaktivitet"
 
 #. / 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
+#: ../src/client/application/geary-args.vala:17
 msgid "Log IMAP replay queue"
 msgstr "Logfør køen af IMAP-svar"
 
-#: ../../src/client/geary-args.vala:11
-msgid "Log conversation monitoring"
-msgstr "Logfør samtaleovervågning"
+#. / 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 "Logfør netværksserialisering"
+
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Logfør periodisk aktivitet"
 
-#: ../../src/client/geary-args.vala:21
+#: ../src/client/application/geary-args.vala:22
 msgid "Log database queries (generates lots of messages)"
 msgstr "Logfør databaseforespørgsler (generérer mange meddelelser)"
 
 #. / "Normalization" can also be called "synchronization"
-#: ../../src/client/geary-args.vala:23
+#: ../src/client/application/geary-args.vala:24
 msgid "Log folder normalization"
 msgstr "Logfør mappenormalisering"
 
-#: ../../src/client/geary-args.vala:13
-msgid "Log network activity"
-msgstr "Logfør netværksaktivitet"
-
-#: ../../src/client/geary-args.vala:12
-msgid "Log network deserialization"
-msgstr "Logfør netværksdeserialisering"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Aktiver undersøgelse af web-visning"
 
-#. / 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 "Logfør netværksserialisering "
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:20
-msgid "Log periodic activity"
-msgstr "Logfør periodisk aktivitet"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Vis programversion"
 
-#: ../../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr ""
 
-#: ../../src/client/geary-application.vala:26
-msgid "Mail Client"
-msgstr "Mailklient"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Send kommentarer, idéer og fejlrapporter til:"
 
-#: ../../src/client/views/conversation-viewer.vala:1479
-msgid "Mark Unread From _Here"
-msgstr "Markér som ulæst _herfra"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Kunne ikke genkende indstillingerne på kommandolinjen: %s\n"
 
-#: ../../src/client/geary-controller.vala:52
-msgid "Mark as S_pam"
-msgstr "Markér som s_pam"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Ukendt kommandolinje-indstilling \"%s\"\n"
 
-#: ../../src/client/geary-controller.vala:277
-msgid "Mark as _Read"
-msgstr "Markér som _læst"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Nye beskeder"
 
-#: ../../src/client/geary-controller.vala:283
-msgid "Mark as _Unread"
-msgstr "Markér som _ulæst"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d ny besked"
+msgstr[1] "%d nye beskeder"
 
-#: ../../src/client/geary-controller.vala:53
-msgid "Mark as not S_pam"
-msgstr "Marker som ikke s_pam"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d ny besked i alt"
+msgstr[1] "%s, %d nye beskeder i alt"
 
-#: ../../src/client/geary-controller.vala:55
-#: ../../src/client/geary-controller.vala:269
-msgid "Mark conversation"
-msgstr "Markér samtale"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d anen ny beksed for %s)"
+msgstr[1] ""
+"%s\n"
+"(%d andre nye beskeder for %s)"
 
-#: ../../src/client/geary-controller.vala:56
-msgid "Mark conversations"
-msgstr "Markér samtaler"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Åbn"
 
-#: ../../src/client/views/formatted-conversation-data.vala:11
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Mig"
 
-#: ../../ui/composer.glade:158
-msgid "Medium"
-msgstr "Mellem"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr ""
 
-#: ../../ui/composer.glade:75
-msgid "More options"
-msgstr "Flere valgmuligheder"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:59
-#: ../../src/client/geary-controller.vala:308
-msgid "Move conversation"
-msgstr "Flyt samtale"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:60
-msgid "Move conversations"
-msgstr "Flyt samtaler"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
 
-#: ../../ui/login.glade:176
-msgid "N_ame:"
-msgstr "N_avn"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr ""
 
-#: ../../ui/login.glade:230
-msgid "N_ickname:"
-msgstr "K_aldenavn"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "Ny besked"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:80
-msgid "Nickname:"
-msgstr "Kaldenavn:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
 
-#: ../../ui/login.glade:661
-msgid "No authentication re_quired"
-msgstr "Ingen autentifikation kr_ævet"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:275
-msgid "No conversations in folder."
-msgstr "Ingen samtaler i denne mappe."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:244
-msgid "No conversations selected."
-msgstr "Ingen samtaler valgt."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:273
-msgid "No search results found."
-msgstr "Ingen søgeresultater blev fundet."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:128
-#: ../../src/engine/api/geary-special-folder-type.vala:58
-msgid "None"
-msgstr "Ingen"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr ""
+
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr ""
+
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Vælg en fil"
+
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Vedhæft"
+
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr ""
+
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Konti"
+
+#. / 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 "Først Sidst"
+
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Velkommen til Geary."
 
-#: ../../ui/preferences.glade:158
-msgid "Notifications"
-msgstr "Notifikationer"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Indtast kontoinformation for at starte."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 uger siden"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 måned siden"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 måneder siden"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 måneder siden"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 år siden"
 
-#: ../../src/client/util/util-date.vala:164
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Alt"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "Hus_k adgangskoder"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "Hu_sk adgangskode"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Kunne ikke validére.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Ugyldigt kaldenavn til bruger.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Email-adressen er allerede tilføjet til Geary\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; IMAP-forbindelsesfejl.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Forkert brugernavn eller adgangskode til IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; SMTP-forbindelsesfejl.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; Forkert brugernavn eller adgangskode til SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Forbindelsesfejl.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Forkert brugernavn eller adgangskode.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Gem"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "Tilføj"
+
+#. / 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 %-l:%M %P"
+
+#: ../src/client/util/util-date.vala:164
 msgid "Now"
 msgstr "Nu"
 
-#. / 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 "%2$s skrev den %1$s:"
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#. / 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 "Den %s:"
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Åbn"
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "I går"
 
-#: ../../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Andet"
+#. / 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
+msgid "%A"
+msgstr "%A"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Udbakke"
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "bytes"
 
-#: ../../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "TB"
 
-#: ../../src/client/geary-args.vala:10
-msgid "Output debugging information"
-msgstr "Vis fejlretningsinformation"
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "GB"
 
-#: ../../ui/login.glade:337
-msgid "P_ort:"
-msgstr "P_ort:"
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "MB"
 
-#: ../../ui/login.glade:474
-msgid "Pass_word:"
-msgstr "Adgangs_kode:"
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "KB"
 
-#: ../../ui/login.glade:101
-msgid "Password"
-msgstr "Adgangskode"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d besked"
+msgstr[1] "%d beskeder"
 
-#: ../../ui/password-dialog.glade:196
-msgid "Password:"
-msgstr "Adgangskode:"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d ulæst"
+msgstr[1] "%d ulæste"
 
-#: ../../ui/composer.glade:102
-msgid "Paste _With Formatting"
-msgstr "Sæt ind _med formatéring"
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your email password"
-msgstr "Indtast din email-adgangskode"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Indbakker"
 
-#: ../../src/client/geary-args.vala:47
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Send kommentarer, idéer og fejlrapporter til:"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Søg %s-konto"
 
-#: ../../ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
-msgstr "Vent venligst mens Geary validérer din konto"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:421
-msgid "Por_t:"
-msgstr "Por_t:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "Ingen samtaler valgt."
 
-#: ../../ui/password-dialog.glade:367 ../../ui/password-dialog.glade:470
-msgid "Port:"
-msgstr "Port:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:81
-msgid "Quote text  (Ctrl+])"
-msgstr "Citér tekst (Ctrl+])"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
+msgstr "Ingen søgeresultater blev fundet."
 
-#: ../../src/client/geary-controller.vala:322
-msgid "R_eply All"
-msgstr "S_var til alle"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
+msgstr "Ingen samtaler i denne mappe."
 
-#: ../../ui/preferences.glade:55
-msgid "Reading"
-msgstr "Læsning"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
+msgstr "Denne besked indeholder billeder."
 
-#: ../../ui/password-dialog.glade:274
-msgid "Real name:"
-msgstr "Rigtigt navn:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr "Vis billeder"
 
-#: ../../src/client/accounts/add-edit-page.vala:590
-msgid "Remem_ber password"
-msgstr "Hu_sk adgangskode"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
+msgstr "Vis altid fra denne afsender"
 
-#: ../../src/client/accounts/add-edit-page.vala:583
-msgid "Remem_ber passwords"
-msgstr "Hus_k adgangskoder"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
+msgstr "Redigér kladde"
 
-#: ../../ui/account_list.glade:97
-msgid "Remove account"
-msgstr "Fjern konto"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "Fra:"
 
-#: ../../ui/composer.glade:95
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Fjern formatéring (Ctrl+Mellemrum)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "Til:"
 
-#: ../../src/client/geary-controller.vala:318
-msgid "Reply (Ctrl+R, R)"
-msgstr "Svar (Ctrl+R, R)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Cc:"
 
-#: ../../src/client/geary-controller.vala:323
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
-msgstr "Svar til alle (Ctrl+Skift+R, Skift+R)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Bcc:"
 
-#: ../../src/client/views/conversation-viewer.vala:1452
-msgid "Reply to _All"
-msgstr "Svar til _alle"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "Emne:"
 
-#: ../../ui/password-dialog.glade:163
-msgid "SMTP Credentials"
-msgstr "SMTP-legitimationsoplysninger"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Dato:"
 
-#: ../../ui/login.glade:507
-msgid "SMTP password"
-msgstr "SMTP-adgangskode"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:439 ../../ui/password-dialog.glade:437
-msgid "SMTP settings"
-msgstr "SMTP-indstillinger"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
+msgstr ""
 
-#: ../../ui/login.glade:491
-msgid "SMTP username"
-msgstr "SMTP-brugernavn"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "_Kopiér"
 
-#: ../../src/client/dialogs/password-dialog.vala:124
-msgid "SSL"
-msgstr "SSL"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "Kopiér _email-adresse"
 
-#: ../../ui/password-dialog.glade:382 ../../ui/password-dialog.glade:485
-msgid "SSL/TLS encryption:"
-msgstr "SSL/TLS-kryptering:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "Kopiér _link"
 
-#: ../../src/client/dialogs/password-dialog.vala:126
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
+msgstr "Vælg _besked"
 
-#: ../../ui/composer.glade:169
-msgid "S_ans Serif"
-msgstr "S_ans serif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Markér _alt"
 
-#: ../../ui/composer.glade:175
-msgid "S_erif"
-msgstr "S_erif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "_Undersøg"
 
-#: ../../ui/login.glade:160
-msgid "S_ervice:"
-msgstr "S_ervice:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr "Dette link ser ud til at føre til"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
+msgstr "men går faktisk til"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
+msgstr " (Ugyldig?)"
 
-#: ../../ui/composer.glade:170
-msgid "Sans Serif"
-msgstr "Sans Serif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
+msgstr "_Gem billede som..."
 
-#: ../../src/client/views/conversation-viewer.vala:1437
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "Gem _som..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "Gem alle v_edhæftede filer..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
 msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] "Gem v_edhæftet fil..."
 msgstr[1] "Gem alle v_edhæftede filer..."
 
-#: ../../src/client/views/conversation-viewer.vala:1400
-msgid "Save All A_ttachments..."
-msgstr "Gem alle v_edhæftede filer..."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "Svar til _alle"
 
-#: ../../src/client/composer/composer-window.vala:41
-msgid "Saved"
-msgstr "Gemt"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "_Markér som læst"
 
-#: ../../src/client/composer/composer-window.vala:42
-msgid "Saving"
-msgstr "Gemmer"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "_Markér som ulæst"
 
-#: ../../ui/login.glade:304
-msgid "Se_rver:"
-msgstr "Se_rver"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
+msgstr "Markér som ulæst _herfra"
 
-#: ../../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 "Søg"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "Vis _kilde"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:39
-#: ../../src/client/ui/main-toolbar.vala:170
-#, c-format
-msgid "Search %s account"
-msgstr "Søg %s-konto"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "Kunne ikke åbne standardprogrammet til tekstredigéring."
 
-#: ../../src/client/ui/main-toolbar.vala:76
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Søg efter ord i al mail tilhørende kontoen %Ctrl+S)"
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr "%s - Samtaleundersøger"
 
-#: ../../src/client/composer/composer-window.vala:1243
-msgid "Select Color"
-msgstr "Vælg farve"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Gemt"
 
-#: ../../src/client/ui/stock.vala:32
-#: ../../src/client/views/conversation-viewer.vala:916
-msgid "Select _All"
-msgstr "Markér _alt"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Gemmer"
 
-#: ../../src/client/views/conversation-viewer.vala:910
-msgid "Select _Message"
-msgstr "Vælg _besked"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Der opstod en fejl under lagring"
 
-#: ../../src/client/geary-application.vala:27
-msgid "Send and receive email"
-msgstr "Send og modtag email"
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:747
-msgid "Send message with an empty body?"
-msgstr "Send beskeden uden nogen tekst?"
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Ny besked"
 
-#: ../../src/client/composer/composer-window.vala:743
+#: ../src/client/composer/composer-widget.vala:138
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Ønsker du at kassére denne besked?"
+
+#: ../src/client/composer/composer-widget.vala:1262
 msgid "Send message with an empty subject and body?"
 msgstr "Send beskeden uden tekst og emne?"
 
-#: ../../src/client/composer/composer-window.vala:745
+#: ../src/client/composer/composer-widget.vala:1264
 msgid "Send message with an empty subject?"
 msgstr "Send beskeden uden et emne?"
 
-#: ../../src/client/composer/composer-window.vala:749
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Send beskeden uden nogen tekst?"
+
+#: ../src/client/composer/composer-widget.vala:1268
 msgid "Send message without an attachment?"
 msgstr "Send beskeden uden en vedhæftet fil?"
 
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Kan ikke tilføje filen"
+
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "\"%s\" blev ikke fundet."
+
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" er en mappe."
+
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" er en tom fil."
+
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "\"%s\" kunne ikke åbnes til læsning."
+
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "\"%s\" er allerede vedhæftet."
+
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Vælg farve"
+
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr ""
+
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr ""
+
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../../src/client/ui/status-bar.vala:25
+#: ../src/client/components/status-bar.vala:26
 msgid "Sending..."
 msgstr "Sender..."
 
-#: ../../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Sendt mail"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:404
-msgid "Ser_ver:"
-msgstr "Ser_ver:"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:176
-msgid "Serif"
-msgstr "Serif"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "ikke fundet"
 
-#: ../../ui/password-dialog.glade:352 ../../ui/password-dialog.glade:455
-msgid "Server:"
-msgstr "Server:"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_OK"
 
-#: ../../ui/password-dialog.glade:259
-msgid "Service:"
-msgstr "Service:"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "Annullér"
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "Show Images"
-msgstr "Vis billeder"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Luk"
 
-#: ../../ui/preferences.glade:193
-msgid "Show _notifications for new mail"
-msgstr "Vis _notifikationer ved nye mails"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Kassér"
 
-#: ../../ui/composer.glade:164
-msgid "Small"
-msgstr "Lille"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Åbn"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Spam"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Udskriv"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Stjernet"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Fjern"
 
-#: ../../ui/login.glade:761
-msgid "Storage"
-msgstr "Lager"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Behold"
 
-#: ../../ui/composer.glade:134
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Overstreget (Ctrl+K)"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Søg efter ord i al mail tilhørende kontoen %Ctrl+S)"
 
-#: ../../src/client/views/conversation-viewer.vala:617
-msgid "Subject:"
-msgstr "Emne:"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Indeksérer %s konto"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Emne: %s\n"
+#~ msgid "%d results"
+#~ msgstr "%d resultater"
 
-#: ../../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#~ msgid "%i matches"
+#~ msgstr "%i matchede"
 
-#: ../../src/client/geary-controller.vala:1493
-#, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr ""
-"Filen findes allerede i \"%s\". Hvis du erstatter den, overskrives dens "
-"indhold."
+#~ msgid "%i matches (wrapped)"
+#~ msgstr "%i matchede (ombrudt)"
 
-#: ../../src/client/geary-controller.vala:747
-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 ""
-"Den lokale maildatabases versionsnummer er til en nyere version af Geary. "
-"Desværre kan databasen ikke blive \"rullet tilbage\", så den virker med "
-"denne version of Geary.\n"
-"\n"
-"Installér venligst den nyeste version af Geary og prøv igen."
+#~ msgid "%u conversations selected."
+#~ msgstr "%u samtaler valgt."
 
-#: ../../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 ""
-"Der opstod en felj under åbning af den lokele konto. Dette sker sikkert på "
-"grund af forbindelsesproblemer.\n"
-"\n"
-"Tjek, at din internetforbindelse virker og genstart derefter Geary."
+#~ msgid "%u read messages"
+#~ msgstr "%u læste beskeder"
 
-#: ../../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 ""
-"Der opstod en fejl under åbningen af den lokale maildatabase til denne "
-"konto. Dette sker sikkert på grund af problemer med filtilladelser.\n"
-"\n"
-"Tjek, at di har læsnings- og skrivningstilladelser for alle filer i denne "
-"mappe.\n"
-"\n"
-"%s"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Er du sikker på, at du vil fjerne "
+#~ "denne konto?</span> "
 
-#: ../../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 ""
-"Der opstod en felj under åbningen af den lokale maildatabase til denne "
-"konto. Dette sker sikkert på grund af, at databasefilen er beskadiget\n"
-"\n"
-"%s\n"
-"\n"
-"Geary kan genopbygge databasefilen og synkronisére med serveren igen eller "
-"afslutte.\n"
-"\n"
-"Genopbygning af databasen vil slette al lokal email og dets vedhæftede "
-"filer. <b>Mail'en på serveren vil ikke blive rørt.</b>"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Kan ikke fjerne konto</span> "
 
-#: ../../src/client/views/conversation-viewer.vala:1147
-msgid "This link appears to go to"
-msgstr "Dette link ser ud til at føre til"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Et beskedskrivningsvindue associéret med denne bruger er i forvejen "
+#~ "åbent.Send eller kassér beskeden og prøv igen."
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "This message contains remote images."
-msgstr "Denne besked indeholder billeder."
+#~ msgid "Add account"
+#~ msgstr "Tilføj konto"
 
-#: ../../ui/composer.glade:435
-msgid "To add them as attachments"
-msgstr "For at vedhæfte dem"
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Al email, der tilhører denne konto vil blive fjernet fra din computer. Dette "
+#~ "vil ikke fjerne emailen på serveren."
 
-#: ../../src/client/views/conversation-viewer.vala:608
-msgid "To:"
-msgstr "Til:"
+#~ msgid "Archive conversation (Delete, Backspace, A)"
+#~ msgstr "Arkivér samtale (Delete, Backspace, A)"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "Til: %s\n"
+#~ msgid "Archive conversations (Delete, Backspace, A)"
+#~ msgstr "Arkivér samtaler (Delete, Backspace, A)"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Papirkurv"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Fed (Ctrl+B)"
 
-#: ../../src/client/geary-controller.vala:294
-msgid "U_nstar"
-msgstr "Stjern ikke"
+#~ msgid "C_olor"
+#~ msgstr "F_arve"
 
-#: ../../src/client/dialogs/password-dialog.vala:17
-msgid "Unable to login to email server"
-msgstr "Kunne ikke logge ind på email-serveren"
+#~ msgid "Compose Message"
+#~ msgstr "Skriv besked"
 
-#: ../../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 "Kunne ikke åbne den lokale postkasse for %s"
+#~ msgid "Composer"
+#~ msgstr "Beskedskriver"
 
-#: ../../src/client/geary-controller.vala:701
-#, c-format
-msgid "Unable to open the database for %s"
-msgstr "Kunne ikke åbne databasen for %s"
+#~ msgid "Copyright 2011-2013 Yorba Foundation"
+#~ msgstr "Copyright 2011-2013 Yorba Foundation"
 
-#: ../../src/client/geary-controller.vala:713
-#, c-format
-msgid "Unable to rebuild database for \"%s\""
-msgstr "Kunne ikke genopbygge databasen for \"%s\""
+#~ msgid "Cu_t"
+#~ msgstr "_Klip"
 
-#: ../../src/client/accounts/add-edit-page.vala:619
-msgid "Unable to validate:\n"
-msgstr "Kunne ikke validére.\n"
+#~ msgid "Delete conversation (Delete, Backspace, A)"
+#~ msgstr "Slet samtale (Delete, Backspace, A)"
 
-#: ../../ui/composer.glade:127
-msgid "Underline (Ctrl+U)"
-msgstr "Understreget (Ctrl+U)"
+#~ msgid "Delete conversations (Delete, Backspace, A)"
+#~ msgstr "Slet samtaler (Delete, Backspace, A)"
 
-#: ../../ui/composer.glade:88
-msgid "Unquote text (Ctrl+[)"
-msgstr "Fjern citat (Ctrl+[)"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Vil du kassére denne ugemte besked?"
 
-#: ../../src/client/geary-args.vala:65
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Ukendt kommandolinje-indstilling \"%s\"\n"
+#~ msgid "Drop files here"
+#~ msgstr "Flyt filer hertil."
 
-#: ../../ui/login.glade:457
-msgid "User_name:"
-msgstr "Bruger_navn:"
+#~ msgid "E_mail address:"
+#~ msgstr "Email-adresse:"
 
-#: ../../ui/password-dialog.glade:70 ../../ui/password-dialog.glade:181
-msgid "Username:"
-msgstr "Brugernavn:"
+#~ msgid "Edit account"
+#~ msgstr "Redigér konto"
 
-#: ../../src/client/geary-application.vala:19
-msgid "Visit the Yorba web site"
-msgstr "Besøg Yorbas hjemmeside"
+#~ msgid "Email address:"
+#~ msgstr "Emailadresse:"
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-#, c-format
-msgid "Welcome to Geary."
-msgstr "Velkommen til Geary."
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Email;E-mail;Mail;Post;"
 
-#: ../../ui/login.glade:252
-msgid "Work, Home, etc."
-msgstr "Arbejde, Hjem, o.s.v."
+#~ msgid "Enable _spell checking"
+#~ msgstr "Aktiver _stavekontrol"
 
-#: ../../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid "Encr_yption:"
+#~ msgstr "Kr_yptering:"
 
-#: ../../src/client/util/util-date.vala:177
-msgid "Yesterday"
-msgstr "I går"
+#~ msgid "Encrypt_ion:"
+#~ msgstr "Krypter_ing:"
 
-#: ../../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 ""
-"Dine IMAP- og/eller SMTP-indstillinger anvender ikke SSL eller TLS. Dette "
-"betyder, at dit brugernavn og din adgangskode kan læses af andre på "
-"netværket. Er du sikker på, at du vil gære dette?"
+#~ msgid "Fixed Width"
+#~ msgstr "Fast bredde"
 
-#: ../../src/client/geary-controller.vala:551
-msgid "Your settings are insecure"
-msgstr "Dine indstillinger er usikre"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary mail"
 
-#: ../../src/client/geary-controller.vala:258
-#: ../../src/client/ui/stock.vala:21
-msgid "_About"
-msgstr "_Om"
+#~ msgid "General"
+#~ msgstr "Generelt"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:22
-msgid "_Add"
-msgstr "Tilføj"
+#~ msgid "IMAP Credentials"
+#~ msgstr "IMAP-legitimationsoplysninger"
 
-#: ../../src/client/geary-controller.vala:47
-msgid "_Archive"
-msgstr "_Arkivér"
+#~ msgid "IMAP password"
+#~ msgstr "IMAP-adgangskode"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Vedhæft"
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP-indstillinger"
 
-#: ../../ui/composer.glade:525
-msgid "_Attach File"
-msgstr "_Vedhæft fil"
+#~ msgid "IMAP username"
+#~ msgstr "IMAP-brugernavn"
 
-#: ../../ui/preferences.glade:69
-msgid "_Automatically select next message"
-msgstr "_Vælg automatisk næste besked"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Kursiv (Ctrl+I)"
 
-#: ../../src/client/ui/stock.vala:19
-msgid "_Cancel"
-msgstr "Annullér"
+#~ msgid "Lar_ge"
+#~ msgstr "_Stor"
 
-#: ../../ui/composer.glade:52
-msgid "_Center"
-msgstr "_Centrér"
+#~ msgid "Large"
+#~ msgstr "Stor"
 
-#: ../../src/client/ui/stock.vala:23
-msgid "_Close"
-msgstr "_Luk"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Link (Ctrl+L)"
 
-#: ../../src/client/views/conversation-viewer.vala:889
-msgid "_Copy"
-msgstr "_Kopiér"
+#~ msgid "Medium"
+#~ msgstr "Mellem"
 
-#: ../../src/client/geary-controller.vala:42
-msgid "_Delete"
-msgstr "_Slet"
+#~ msgid "More options"
+#~ msgstr "Flere valgmuligheder"
 
-#: ../../ui/password-dialog.glade:548
-msgid "_Details"
-msgstr "_Detaljer"
+#~ msgid "N_ame:"
+#~ msgstr "N_avn"
 
-#: ../../src/client/ui/stock.vala:24
-msgid "_Discard"
-msgstr "_Kassér"
+#~ msgid "N_ickname:"
+#~ msgstr "K_aldenavn"
 
-#: ../../ui/preferences.glade:90
-msgid "_Display conversation preview"
-msgstr "_Vis samtaleforudvisning"
+#~ msgid "Nickname:"
+#~ msgstr "Kaldenavn:"
 
-#: ../../src/client/geary-controller.vala:262
-msgid "_Donate"
-msgstr "_Donér"
+#~ msgid "No authentication re_quired"
+#~ msgstr "Ingen autentifikation kr_ævet"
 
-#: ../../ui/login.glade:782
-msgid "_Download mail:"
-msgstr "_Download mail:"
+#~ msgid "Notifications"
+#~ msgstr "Notifikationer"
 
-#: ../../ui/composer.glade:181
-msgid "_Fixed Width"
-msgstr "_Fast bredde"
+#~ msgid "P_ort:"
+#~ msgstr "P_ort:"
 
-#: ../../src/client/geary-controller.vala:328
-#: ../../src/client/views/conversation-viewer.vala:1457
-msgid "_Forward"
-msgstr "_Videresend"
+#~ msgid "Pass_word:"
+#~ msgstr "Adgangs_kode:"
 
-#: ../../src/client/geary-controller.vala:254
-#: ../../src/client/ui/stock.vala:25
-msgid "_Help"
-msgstr "_Hjælp"
+#~ msgid "Password"
+#~ msgstr "Adgangskode"
 
-#: ../../ui/composer.glade:542
-msgid "_Include Original Attachments"
-msgstr "_Inkludér original vedhæftning"
+#~ msgid "Password:"
+#~ msgstr "Adgangskode:"
 
-#: ../../src/client/views/conversation-viewer.vala:922
-msgid "_Inspect"
-msgstr "_Undersøg"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Sæt ind _med formatéring"
 
-#: ../../ui/composer.glade:57
-msgid "_Justify"
-msgstr "_Juster"
+#~ msgid "Please enter your email password"
+#~ msgstr "Indtast din email-adgangskode"
 
-#: ../../src/client/ui/stock.vala:33
-msgid "_Keep"
-msgstr "_Behold"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Vent venligst mens Geary validérer din konto"
 
-#: ../../src/client/geary-controller.vala:305
-msgid "_Label"
-msgstr "_Etiket"
+#~ msgid "Por_t:"
+#~ msgstr "Por_t:"
 
-#: ../../ui/composer.glade:42
-msgid "_Left"
-msgstr "_Venstre"
+#~ msgid "Port:"
+#~ msgstr "Port:"
 
-#: ../../src/client/views/conversation-viewer.vala:1469
-msgid "_Mark as Read"
-msgstr "_Markér som læst"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Citér tekst (Ctrl+])"
 
-#: ../../src/client/views/conversation-viewer.vala:1473
-msgid "_Mark as Unread"
-msgstr "_Markér som ulæst"
+#~ msgid "Reading"
+#~ msgstr "Læsning"
 
-#: ../../src/client/geary-controller.vala:271
-msgid "_Mark as..."
-msgstr "_Markér som..."
+#~ msgid "Real name:"
+#~ msgstr "Rigtigt navn:"
 
-#: ../../ui/composer.glade:157
-msgid "_Medium"
-msgstr "_Mellem"
+#~ msgid "Remove account"
+#~ msgstr "Fjern konto"
 
-#: ../../src/client/geary-controller.vala:309
-msgid "_Move"
-msgstr "_Flyt"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Fjern formatéring (Ctrl+Mellemrum)"
 
-#: ../../src/client/ui/stock.vala:18
-msgid "_OK"
-msgstr "_OK"
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP-legitimationsoplysninger"
 
-#: ../../src/client/ui/stock.vala:26
-msgid "_Open"
-msgstr "_Åbn"
+#~ msgid "SMTP password"
+#~ msgstr "SMTP-adgangskode"
 
-#: ../../ui/login.glade:131 ../../ui/login.glade:539
-#: ../../ui/password-dialog.glade:85
-msgid "_Password:"
-msgstr "_Adgangskode:"
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP-indstillinger"
 
-#: ../../ui/composer.glade:35
-msgid "_Paste"
-msgstr "Sæt _ind"
+#~ msgid "SMTP username"
+#~ msgstr "SMTP-brugernavn"
 
-#: ../../ui/preferences.glade:172
-msgid "_Play notification sounds"
-msgstr "_Afspil notifikationslyde"
+#~ msgid "SSL"
+#~ msgstr "SSL"
 
-#: ../../src/client/geary-controller.vala:250
-#: ../../src/client/ui/stock.vala:27
-msgid "_Preferences"
-msgstr "_Indstillinger"
+#~ msgid "SSL/TLS encryption:"
+#~ msgstr "SSL/TLS-kryptering:"
 
-#: ../../src/client/ui/stock.vala:28
-msgid "_Print..."
-msgstr "_Udskriv"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../../src/client/geary-controller.vala:266
-#: ../../src/client/ui/stock.vala:29
-msgid "_Quit"
-msgstr "Af_slut"
+#~ msgid "S_ans Serif"
+#~ msgstr "S_ans serif"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "_Rebuild"
-msgstr "_Genopbyg"
+#~ msgid "S_erif"
+#~ msgstr "S_erif"
 
-#: ../../ui/composer.glade:14
-msgid "_Redo"
-msgstr "_Genskab"
+#~ msgid "S_ervice:"
+#~ msgstr "S_ervice:"
 
-#: ../../ui/password-dialog.glade:561
-msgid "_Remember passwords"
-msgstr "_Husk adgangskoder"
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../../src/client/ui/stock.vala:30
-msgid "_Remove"
-msgstr "_Fjern"
+#~ msgid "Se_rver:"
+#~ msgstr "Se_rver"
 
-#: ../../src/client/geary-controller.vala:1496
-msgid "_Replace"
-msgstr "_Erstat"
+#~ msgid "Send and receive email"
+#~ msgstr "Send og modtag email"
 
-#: ../../src/client/geary-controller.vala:317
-#: ../../src/client/views/conversation-viewer.vala:1447
-msgid "_Reply"
-msgstr "_Svar"
+#~ msgid "Ser_ver:"
+#~ msgstr "Ser_ver:"
 
-#: ../../ui/composer.glade:141
-msgid "_Rich Text"
-msgstr "_Formateret tekst"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../../ui/composer.glade:47
-msgid "_Right"
-msgstr "_Højre"
+#~ msgid "Server:"
+#~ msgstr "Server:"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:31
-msgid "_Save"
-msgstr "_Gem"
+#~ msgid "Service:"
+#~ msgstr "Service:"
 
-#: ../../src/client/views/conversation-viewer.vala:1395
-msgid "_Save As..."
-msgstr "Gem _som..."
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Vis _notifikationer ved nye mails"
 
-#: ../../src/client/views/conversation-viewer.vala:1414
-msgid "_Save Image As..."
-msgstr "_Gem billede som..."
+#~ msgid "Small"
+#~ msgstr "Lille"
 
-#: ../../ui/composer.glade:594
-msgid "_Send"
-msgstr "_Send"
+#~ msgid "Storage"
+#~ msgstr "Lager"
 
-#: ../../ui/composer.glade:163
-msgid "_Small"
-msgstr "_Lille"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Overstreget (Ctrl+K)"
 
-#: ../../src/client/geary-controller.vala:289
-msgid "_Star"
-msgstr "St_jern"
+#~ msgid "To add them as attachments"
+#~ msgstr "For at vedhæfte dem"
 
-#: ../../ui/composer.glade:7
-msgid "_Undo"
-msgstr "_Fortryd"
+#~ msgid "Unable to login to email server"
+#~ msgstr "Kunne ikke logge ind på email-serveren"
 
-#: ../../ui/login.glade:522
-msgid "_Username:"
-msgstr "_Brugernavn:"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Understreget (Ctrl+U)"
 
-#: ../../src/client/views/conversation-viewer.vala:1494
-msgid "_View Source"
-msgstr "Vis _kilde"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Fjern citat (Ctrl+[)"
 
-#. / 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 "vedhæft | indeholder"
+#~ msgid "User_name:"
+#~ msgstr "Bruger_navn:"
 
-#: ../../src/client/views/conversation-viewer.vala:1148
-msgid "but actually goes to"
-msgstr "men går faktisk til"
+#~ msgid "Username:"
+#~ msgstr "Brugernavn:"
 
-#: ../../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "bytes"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Arbejde, Hjem, o.s.v."
 
-#. / Placeholder filename for attachments with no filename.
-#: ../../src/client/views/conversation-viewer.vala:1799
-#: ../../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "intet"
+#~ msgid "_Attach File"
+#~ msgstr "_Vedhæft fil"
 
-#: ../../src/client/views/conversation-find-bar.vala:226
-msgid "not found"
-msgstr "ikke fundet"
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Vælg automatisk næste besked"
 
-#. / 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 "Nikolaj Holmquist Pedersen <nikolajholmquist gmail com>"
+#~ msgid "_Center"
+#~ msgstr "_Centrér"
+
+#~ msgid "_Delete"
+#~ msgstr "_Slet"
+
+#~ msgid "_Details"
+#~ msgstr "_Detaljer"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Vis samtaleforudvisning"
+
+#~ msgid "_Donate"
+#~ msgstr "_Donér"
+
+#~ msgid "_Download mail:"
+#~ msgstr "_Download mail:"
+
+#~ msgid "_Fixed Width"
+#~ msgstr "_Fast bredde"
+
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Inkludér original vedhæftning"
+
+#~ msgid "_Justify"
+#~ msgstr "_Juster"
+
+#~ msgid "_Left"
+#~ msgstr "_Venstre"
+
+#~ msgid "_Medium"
+#~ msgstr "_Mellem"
+
+#~ msgid "_Password:"
+#~ msgstr "_Adgangskode:"
+
+#~ msgid "_Paste"
+#~ msgstr "Sæt _ind"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Afspil notifikationslyde"
+
+#~ msgid "_Redo"
+#~ msgstr "_Genskab"
+
+#~ msgid "_Remember passwords"
+#~ msgstr "_Husk adgangskoder"
+
+#~ msgid "_Rich Text"
+#~ msgstr "_Formateret tekst"
+
+#~ msgid "_Right"
+#~ msgstr "_Højre"
+
+#~ msgid "_Send"
+#~ msgstr "_Send"
+
+#~ msgid "_Small"
+#~ msgstr "_Lille"
+
+#~ msgid "_Undo"
+#~ msgstr "_Fortryd"
+
+#~ msgid "_Username:"
+#~ msgstr "_Brugernavn:"
+
+#~ msgid "attach|enclosed|enclosing|cover letter"
+#~ msgstr "vedhæft | indeholder"
diff --git a/po/de.po b/po/de.po
index e54b3d4..a432eab 100644
--- a/po/de.po
+++ b/po/de.po
@@ -16,455 +16,431 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-08-06 17:14+0000\n"
-"PO-Revision-Date: 2015-08-15 15:36+0200\n"
-"Last-Translator: Simon Linden <xhi2018 googlemail com>\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 00:59+0000\n"
+"Last-Translator: Simon Linden <Unknown>\n"
 "Language-Team: Deutsch <gnome-de gnome org>\n"
-"Language: de\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: Poedit 1.8.4\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Mail-Client"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary Mail"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Senden und empfangen"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-Mail;Mail;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Nachricht verfassen"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Als E-Mail versenden"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Dateien mit Geary versenden"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Speichern"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:54+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: de\n"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Hinzufügen"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Entwürfe | Entwurf"
 
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "Zusätzliche Adressen für %s"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
+"Gesendet | Gesendete E-Mail | Gesendete E-Mails | Sent | Sent Mail | Sent "
+"Email | Sent E-Mail"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Konten"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
+"Ungewünscht | Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail "
+"| Bulk Email | Bulk E-Mail"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Vorname Nachname"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Papierkorb | Müll | Trash | Rubbish | Rubbish Bin"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Welcome to Geary."
-msgstr "Willkommen bei Geary."
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr "Archiv | Archive | Archive | Archives"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Enter your account information to get started."
-msgstr "Tragen Sie zu Beginn bitte Ihre Kontodaten ein."
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Posteingang"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "2 weeks back"
-msgstr "2 Wochen zurück"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Entwürfe"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "1 month back"
-msgstr "1 Monat zurück"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Gesendete E-Mails"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "3 months back"
-msgstr "3 Monate zurück"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Markiert"
 
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "6 months back"
-msgstr "6 Monate zurück"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Wichtig"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "1 year back"
-msgstr "1 Jahr zurück"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Alle E-Mails"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-msgid "2 years back"
-msgstr "2 Jahre zurück"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Spam"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-msgid "4 years back"
-msgstr "4 Jahre zurück"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Papierkorb"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "Everything"
-msgstr "Alles"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Postausgang"
 
-#: ../src/client/accounts/add-edit-page.vala:280
-msgid "Edit"
-msgstr "Bearbeiten"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Suchen"
 
-#: ../src/client/accounts/add-edit-page.vala:282
-msgid "Preview"
-msgstr "Vorschau"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Archivieren"
 
-#: ../src/client/accounts/add-edit-page.vala:723
-msgid "Remem_ber passwords"
-msgstr "Passwörter _merken"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Nichts"
 
-#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "Passwort _merken"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:764
-msgid "Unable to validate:\n"
-msgstr "Bestätigung nicht möglich:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:766
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Ungültiger Konto-Nickname.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:769
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; E-Mail-Adresse wurde bereits zu Geary hinzugefügt.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:773
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP-Verbindungsfehler.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:776
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; IMAP-Benutzername oder Passwort ungültig.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Andere"
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP-Verbindungsfehler.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "Anhang"
 
-#: ../src/client/accounts/add-edit-page.vala:782
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; SMTP-Benutzername oder Passwort ungültig.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "bcc"
 
-#: ../src/client/accounts/add-edit-page.vala:786
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Verbindungsfehler.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "Nachricht"
 
-#: ../src/client/accounts/add-edit-page.vala:790
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; IMAP-Benutzername oder Passwort ungültig.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "cc:"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011-2015 Yorba Foundation"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "von"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Yorba-Webseite besuchen"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "Betreff"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Geary mit verstecktem Hauptfenster starten"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "an"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Debuginformationen ausgeben"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "mir"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Gesprächsmonitoring protokollieren"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(kein Betreff)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Netzwerkdeserialisierung protokollieren"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %-e. %b, %Y um %-l:%M %p"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Netzwerkaktivitäten protokollieren"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "Am %1$s schrieb %2$s:"
 
-#. / 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 "IMAP-Ereigniswarteschlange protokollieren"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s schrieb:"
 
-#. / 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 "Netzwerkserialisierung protokollieren"
+#. / 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:234
+msgid "On %s:"
+msgstr "Am %s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Regelmäßige Aktivitäten protokollieren"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Weitergeleitete Nachricht ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr ""
-"Datenbankabfragen protokollieren (dabei werden sehr viele Einträge erzeugt)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Von: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Ordnersynchronisation protokollieren"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Betreff: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Untersuchung der Webansicht erlauben"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Datum: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Alle Server-Zertifikate mit TLS-Warnungen widerrufen"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "An: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Programmversion anzeigen"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Cc: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Benutzen Sie %s um ein neues »Verfassen«-Fenster zu öffnen"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "keine"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Bitte melden Sie Kommentare, Vorschläge und Fehler an:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Mail-Client"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Die Kommandozeilenargumente konnten nicht interpretiert werden: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "Copyright 2011-2015 Yorba Foundation"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Unbekanntes Kommandozeilenargument »%s«\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Yorba-Webseite besuchen"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:61
 msgid "Delete conversation"
 msgstr "Konversation löschen"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Konversation löschen (Umschalt+Entf)"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Konversationen löschen (Umschalt+Entf)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:67
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Konversation in den Papierkorb verschieben (Entf, Rücktaste)"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:68
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "Konversationen in den Papierkorb verschieben (Entf, Rücktaste)"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Archivieren"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Konversation archivieren (A)"
 
-#: ../src/client/application/geary-controller.vala:75
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Konversationen archivieren (A)"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Als S_pam markieren"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
-msgstr " S_pam-Markierung entfernen"
+msgstr "S_pam-Markierung entfernen"
 
-#: ../src/client/application/geary-controller.vala:81
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Konversation markieren"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Konversationen markieren"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Konversation ein Label zuweisen"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Konversationen ein Label zuweisen"
 
-#: ../src/client/application/geary-controller.vala:85
-#: ../src/client/application/geary-controller.vala:436
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Konversation verschieben"
 
-#: ../src/client/application/geary-controller.vala:86
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Konversationen verschieben"
 
-#: ../src/client/application/geary-controller.vala:373
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "Konten"
 
-#: ../src/client/application/geary-controller.vala:378
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: ../src/client/application/geary-controller.vala:382
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../src/client/application/geary-controller.vala:386
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Über"
 
-#: ../src/client/application/geary-controller.vala:390
-msgid "_Donate"
-msgstr "_Spenden"
-
-#: ../src/client/application/geary-controller.vala:394
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../src/client/application/geary-controller.vala:399
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Markieren als …"
 
-#: ../src/client/application/geary-controller.vala:405
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Als _gelesen markieren"
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Stern"
 
-#: ../src/client/application/geary-controller.vala:422
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "_Stern entfernen"
 
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Label zuweisen"
 
-#: ../src/client/application/geary-controller.vala:433
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Label"
 
-#: ../src/client/application/geary-controller.vala:437
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Verschieben"
 
-#: ../src/client/application/geary-controller.vala:441
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Neue Nachricht verfassen (Strg+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:445
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Antworten"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Antworten (Strg+R, R)"
 
-#: ../src/client/application/geary-controller.vala:450
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "Allen _antworten"
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Allen antworten (Strg+Umschalt+R, Umschalt+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Weiter (Strg+L, F)"
 
-#: ../src/client/application/geary-controller.vala:496
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr "Leeren"
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr "Spam oder Papierkorb leeren"
 
-#: ../src/client/application/geary-controller.vala:501
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr "_Spam leeren …"
 
-#: ../src/client/application/geary-controller.vala:505
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr "_Papierkorb leeren"
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:538
+#: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
 msgstr "Suchleiste anzeigen/verbergen"
 
-#: ../src/client/application/geary-controller.vala:752
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Ausnahme für Serververtrauen konnte nicht gespeichert werden"
 
-#: ../src/client/application/geary-controller.vala:989
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Ihre Einstellungen sind unsicher"
 
-#: ../src/client/application/geary-controller.vala:990
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -475,17 +451,17 @@ msgstr ""
 "anderen Personen im selben Netzwerk gelesen werden können. Sind Sie sicher, "
 "dass Sie dies tun möchten?"
 
-#: ../src/client/application/geary-controller.vala:991
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "Weiter"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Fehler beim Senden der E-Mail"
 
-#: ../src/client/application/geary-controller.vala:1070
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -493,14 +469,12 @@ msgstr ""
 "Beim Senden einer E-Mail trat ein Fehler auf. Wenn dieses Problem auch "
 "weiterhin besteht, löschen Sie bitte die E-Mail aus dem Postausgang."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Fehler beim Speichern der gesendeten E-Mail"
 
-#: ../src/client/application/geary-controller.vala:1075
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -508,20 +482,15 @@ msgstr ""
 "Beim Speichern einer gesendeten E-Mail trat ein Fehler auf. Die Nachricht "
 "bleibt im Postausgang bis Sie sie löschen."
 
-#: ../src/client/application/geary-controller.vala:1144
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Labels"
 
-#. give the user two options: reset the Account local store, or exit Geary.  A third
-#. could be done to leave the Account in an unopened state, but we don't currently
-#. have provisions for that.
-#: ../src/client/application/geary-controller.vala:1156
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Die Datenbank für %s konnte nicht geöffnet werden"
 
-#: ../src/client/application/geary-controller.vala:1157
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -545,21 +514,19 @@ msgstr ""
 "dazugehörigen Anhänge verloren. <b>E-Mails auf Ihrem Server werden nicht "
 "betroffen sein.</b>"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "_Wiedererstellen"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "B_eenden"
 
-#: ../src/client/application/geary-controller.vala:1168
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Die Datenbank für %s konnte nicht wieder hergestellt werden"
 
-#: ../src/client/application/geary-controller.vala:1169
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -569,17 +536,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1191
-#: ../src/client/application/geary-controller.vala:1201
-#: ../src/client/application/geary-controller.vala:1212
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Der lokale Posteingang für %s konnte nicht geöffnet werden"
 
-#: ../src/client/application/geary-controller.vala:1192
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -597,7 +560,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1202
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -610,9 +573,9 @@ msgstr ""
 "werden, damit sie mit dieser Version von Geary funktioniert.\n"
 "\n"
 "Bitte installieren Sie die neueste Version von Geary und versuchen Sie es "
-"erneut. "
+"erneut."
 
-#: ../src/client/application/geary-controller.vala:1213
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -624,27 +587,29 @@ msgstr ""
 "\n"
 "Bitte überprüfen Sie Ihre Verbindung und starten Sie Geary neu."
 
-#: ../src/client/application/geary-controller.vala:1721
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "Info zu %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1724
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
-msgstr "Benjamin Steinwender <b stbe at>"
+msgstr ""
+"Benjamin Steinwender <b stbe at>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Simon Linden https://launchpad.net/~xhi2018";
 
-#: ../src/client/application/geary-controller.vala:1990
+#: ../src/client/application/geary-controller.vala:1976
 msgid "Undo move (Ctrl+Z)"
 msgstr "Verschieben rückgängig machen (Strg+Z)"
 
-#: ../src/client/application/geary-controller.vala:2000
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Möchten Sie »%s« wirklich öffnen?"
 
-#: ../src/client/application/geary-controller.vala:2001
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -652,299 +617,536 @@ msgstr ""
 "Anhänge können Ihr System beschädigen, wenn diese geöffnet werden. Öffnen "
 "Sie nur Dateien von vertrauenswürdigen Quellen."
 
-#: ../src/client/application/geary-controller.vala:2002
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Nicht _noch einmal fragen"
 
-#: ../src/client/application/geary-controller.vala:2020
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Die Datei »%s« existiert schon. Möchten Sie diese ersetzen?"
 
-#: ../src/client/application/geary-controller.vala:2022
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "Die Datei existiert bereits in »%s«. Beim Ersetzen wird die Datei "
 "überschrieben."
 
-#: ../src/client/application/geary-controller.vala:2025
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Ersetzen"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2323
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Offene Nachrichtenentwürfe schließen?"
 
-#: ../src/client/application/geary-controller.vala:2453
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr "Alle E-Mails aus dem Ordner %s löschen?"
 
-#: ../src/client/application/geary-controller.vala:2454
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr "Dies wird die E-Mail aus Geary und von Ihrem E-Mail-Server löschen."
 
-#: ../src/client/application/geary-controller.vala:2455
+#: ../src/client/application/geary-controller.vala:2441
 msgid "This cannot be undone."
 msgstr "Dies kann nicht rückgängig gemacht werden."
 
-#: ../src/client/application/geary-controller.vala:2456
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr "%s leeren"
 
-#: ../src/client/application/geary-controller.vala:2473
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 msgid "Error emptying %s"
 msgstr "Fehler beim Leeren von %s"
 
-#: ../src/client/application/geary-controller.vala:2503
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Möchten Sie diese Nachricht dauerhaft löschen?"
 msgstr[1] "Möchten Sie diese Nachrichten dauerhaft löschen?"
 
-#: ../src/client/application/geary-controller.vala:2505
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../src/client/application/geary-controller.vala:2536
+#: ../src/client/application/geary-controller.vala:2522
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Archivieren rückgängig (Strg+Z)"
 
-#: ../src/client/application/geary-controller.vala:2551
+#: ../src/client/application/geary-controller.vala:2537
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Papierkorb rückgängig (Strg+Z)"
 
-#: ../src/client/application/geary-controller.vala:2604
+#: ../src/client/application/geary-controller.vala:2590
 msgid "Undo (Ctrl+Z)"
 msgstr "Rückgängig (Strg+Z)"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i Treffer"
-msgstr[1] "%i Treffer"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Geary mit verstecktem Hauptfenster starten"
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i Treffer (gefaltet)"
-msgstr[1] "%i Treffer (gefaltet)"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Debuginformationen ausgeben"
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "nicht gefunden"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Gesprächsmonitoring protokollieren"
 
-#: ../src/client/components/main-window.vala:430
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Netzwerkdeserialisierung protokollieren"
 
-#: ../src/client/components/search-bar.vala:10
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Suchen"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Netzwerkaktivitäten protokollieren"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:25
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Alle E-Mails dieses Kontos nach Stichworten durchsuchen (Strg+S)"
+#. / 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 "IMAP-Ereigniswarteschlange protokollieren"
 
-#: ../src/client/components/search-bar.vala:118
-#, c-format
-msgid "Indexing %s account"
-msgstr "%s-Konto indizieren"
+#. / 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 "Netzwerkserialisierung protokollieren"
 
-#: ../src/client/components/search-bar.vala:129
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "%s-Konto durchsuchen"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Regelmäßige Aktivitäten protokollieren"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Senden …"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr ""
+"Datenbankabfragen protokollieren (dabei werden sehr viele Einträge erzeugt)"
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_OK"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Ordnersynchronisation protokollieren"
 
-#: ../src/client/components/stock.vala:19
-#: ../ui/edit_alternate_emails.glade.h:3 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Abbrechen"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Untersuchung der Webansicht erlauben"
 
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Schließen"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Alle Server-Zertifikate mit TLS-Warnungen widerrufen"
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Verwerfen"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Programmversion anzeigen"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Öffnen"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Benutzen Sie %s um ein neues »Verfassen«-Fenster zu öffnen"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Drucken …"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Bitte melden Sie Kommentare, Vorschläge und Fehler an:"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Entfernen"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Die Kommandozeilenargumente konnten nicht interpretiert werden: %s\n"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "Alles _auswählen"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Unbekanntes Kommandozeilenargument »%s«\n"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Behalten"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Neue Nachrichten"
 
-#: ../src/client/composer/composer-widget.vala:73
-msgid "Saved"
-msgstr "Gespeichert"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d neue Nachricht"
+msgstr[1] "%d neue Nachrichten"
 
-#: ../src/client/composer/composer-widget.vala:74
-msgid "Saving"
-msgstr "Speichern"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, insgesamt %d neue Nachricht"
+msgstr[1] "%s, insegesamt %d neue Nachrichten"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "Error saving"
-msgstr "Fehler beim Speichern"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d andere neue Nachricht für %s)"
+msgstr[1] ""
+"%s\n"
+"(%d andere neue Nachrichten für %s)"
 
-#: ../src/client/composer/composer-widget.vala:76
-msgid "Press Backspace to delete quote"
-msgstr "Rücktaste um die Einrückung zu entfernen"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Öffnen"
 
-#: ../src/client/composer/composer-widget.vala:77
-msgid "New Message"
-msgstr "Neue Nachricht"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Ich"
 
-#. A 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:138
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr "Nicht vertrauenswürdige Verbindung: %s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
+"Die Identität des %s E-Mail-Servers an der Adresse %s:%u konnte nicht "
+"verifiziert werden."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
 msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
-"Anhang|Anhänge|angehängt|anhängen|Wiedervorlage|Beilage|beilegen|Anlage|"
-"anbei|beigefügt|anhängend"
+"Wenn Sie »Diesem Server vertrauen« oder »Diesem Server immer vertrauen« "
+"auswählen, ist es möglich, dass Ihr Benutzername und Passwort auf unsichere "
+"Art übertragen werden."
 
-#: ../src/client/composer/composer-widget.vala:1102
-#: ../src/client/composer/composer-widget.vala:1106
-msgid "Do you want to discard this message?"
-msgstr "Möchten Sie diese Nachricht verwerfen?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"Wenn Sie »Diesem Server nicht vertrauen« auswählen, wird Geary nicht auf "
+"diesen Server zugreifen."
 
-#: ../src/client/composer/composer-widget.vala:1262
-msgid "Send message with an empty subject and body?"
-msgstr "Nachricht ohne Betreff und Inhalt senden?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Geary wird dieses E-Mail-Konto nicht hinzufügen oder aktualisieren"
 
-#: ../src/client/composer/composer-widget.vala:1264
-msgid "Send message with an empty subject?"
-msgstr "Nachricht ohne Betreff senden?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"Wenn Sie »Diesem Server nicht vertrauen« auswählen, wird Geary nicht auf "
+"dieses Konto zugreifen."
 
-#: ../src/client/composer/composer-widget.vala:1266
-msgid "Send message with an empty body?"
-msgstr "Nachricht ohne Inhalt senden?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
+"Geary wird beendet, falls Sie keine anderen offenen E-Mail-Konten haben."
 
-#: ../src/client/composer/composer-widget.vala:1268
-msgid "Send message without an attachment?"
-msgstr "Nachricht ohne Anhang senden?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Kontaktieren Sie Ihren Systemadministrator oder E-Mail-Provider, falls Sie "
+"irgendwelche Fragen zu diesen Problemen haben."
 
-#: ../src/client/composer/composer-widget.vala:1530
-msgid "Cannot add attachment"
-msgstr "Anhang kann nicht hinzugefügt werden"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
+"Das Server-Zertifikat wurde von keiner bekannten Zertifizierungsstelle "
+"signiert"
 
-#: ../src/client/composer/composer-widget.vala:1541
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "»%s« konnte nicht gefunden werden."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr ""
+"Die Identität des Servers stimmt nicht mit der Identität im Zertifikat "
+"überein"
 
-#: ../src/client/composer/composer-widget.vala:1548
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "»%s« ist ein Ordner."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Das Zertifikat des Servers ist abgelaufen"
 
-#: ../src/client/composer/composer-widget.vala:1555
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "»%s« ist eine leere Datei."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "Das Zertifikat des Servers wurde nicht aktiviert"
 
-#: ../src/client/composer/composer-widget.vala:1569
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "»%s« konnte nicht zum Lesen geöffnet werden."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "Das Zertifikat des Servers wurde widerrufen und ist jetzt ungültig"
 
-#: ../src/client/composer/composer-widget.vala:1576
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "»%s« ist bereits als Anhang ausgewählt worden."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "Das Zertifikat des Servers wird als unsicher erachtet"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1585
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr ""
+"Ein Fehler ist während der Bearbeitung des Server-Zertifikats aufgetreten"
 
-#: ../src/client/composer/composer-widget.vala:1645
-msgid "To: "
-msgstr "An: "
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr "Geary benötigt Ihr E-Mail-Passwort, um fortzufahren"
 
-#: ../src/client/composer/composer-widget.vala:1648
-msgid "Cc: "
-msgstr "Cc: "
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Datei auswählen"
 
-#: ../src/client/composer/composer-widget.vala:1651
-msgid "Bcc: "
-msgstr "Bcc:"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Anhängen"
 
-#: ../src/client/composer/composer-widget.vala:1654
-msgid "Reply-To: "
-msgstr "Antwort an: "
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr "Zusätzliche Adressen für %s"
 
-#: ../src/client/composer/composer-widget.vala:1887
-msgid "Select Color"
-msgstr "Farbe auswählen"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Konten"
 
-#. 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:2322
-#, c-format
-msgid "%1$s via %2$s"
-msgstr "%1$s über %2$s"
+#. / 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 "Vorname Nachname"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2364
-msgid "_From:"
-msgstr "_Von:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Willkommen bei Geary."
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Ich"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Tragen Sie zu Beginn bitte Ihre Kontodaten ein."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 Wochen zurück"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 Monat zurück"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 Monate zurück"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 Monate zurück"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 Jahr zurück"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "2 Jahre zurück"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "4 Jahre zurück"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Alles"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr "Vorschau"
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "Passwörter _merken"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "Passwort _merken"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Bestätigung nicht möglich:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Ungültiger Konto-Nickname.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; E-Mail-Adresse wurde bereits zu Geary hinzugefügt.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; IMAP-Verbindungsfehler.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; IMAP-Benutzername oder Passwort ungültig.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; SMTP-Verbindungsfehler.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; SMTP-Benutzername oder Passwort ungültig.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Verbindungsfehler.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; IMAP-Benutzername oder Passwort ungültig.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Speichern"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Hinzufügen"
+
+#. / 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 "%l:%M %P"
+
+#. / 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 um %-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 %-l:%M %P"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Jetzt"
+
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "vor %dm"
+msgstr[1] "vor %dm"
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "vor %dh"
+msgstr[1] "vor %dh"
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Gestern"
+
+#. / 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
+msgid "%A"
+msgstr "%A"
+
+#: ../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/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d Nachricht"
+msgstr[1] "%d Nachrichten"
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d ungelesen"
+msgstr[1] "%d ungelesen"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Posteingänge"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "%s-Konto durchsuchen"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d Ergebnis"
+msgstr[1] "%d Ergebnisse"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "Keine Konversation ausgewählt"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "%u Konversation ausgewählt."
@@ -999,42 +1201,38 @@ msgid "Date:"
 msgstr "Datum:"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "%u gelesene Nachricht"
 msgstr[1] "%u gelesene Nachrichten"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr ""
 "Diese Nachricht wurde erfolgreich gesendet, konnte aber nicht nach %s "
 "gespeichert werden."
 
-#. Add a menu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#. Add a menu item for copying the address.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "E-Mail-Adresse kopieren"
 
-#. Add a menu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Link kopieren"
 
-#. Select message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "_Nachricht auswählen"
 
-#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Alles _auswählen"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "_Untersuchen"
@@ -1047,7 +1245,6 @@ msgstr "Dieser Verweis scheint zu folgender Seite zu führen:"
 msgid "but actually goes to"
 msgstr "aber führt tatsächlich zu"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
 msgstr " (Ungültig?)"
@@ -1070,12 +1267,10 @@ msgid_plural "Save All A_ttachments..."
 msgstr[0] "Anhang speichern"
 msgstr[1] "Alle Anhänge speichern"
 
-#. Reply to all on a message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "Allen antworten"
 
-#. Mark as read/unread.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "Als _gelesen markieren"
@@ -1088,1081 +1283,624 @@ msgstr "Als _ungelesen markieren"
 msgid "Mark Unread From _Here"
 msgstr "Von _hier ab als ungelesen markieren"
 
-#. Separator.
-#. View original message source.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "_Quelltext anzeigen"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:378
-msgid "none"
-msgstr "keine"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "Der Standard-Texteditor konnte nicht geöffnet werden."
 
 #: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s - Konversationsinspektor"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Datei auswählen"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Gespeichert"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Anhängen"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Speichern"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
-msgid "Untrusted Connection: %s"
-msgstr "Nicht vertrauenswürdige Verbindung: %s"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Fehler beim Speichern"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
-msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr ""
-"Die Identität des %s E-Mail-Servers an der Adresse %s:%u konnte nicht "
-"verifiziert werden."
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "Rücktaste um die Einrückung zu entfernen"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
-msgid ""
-"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-"your username and password to be transmitted insecurely."
-msgstr ""
-"Wenn Sie »Diesem Server vertrauen« oder »Diesem Server immer vertrauen« "
-"auswählen, ist es möglich, dass Ihr Benutzername und Passwort auf unsichere "
-"Art übertragen werden."
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Neue Nachricht"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-"server."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Wenn Sie »Diesem Server nicht vertrauen« auswählen, wird Geary nicht auf "
-"diesen Server zugreifen."
+"Anhang|Anhänge|angehängt|anhängen|Wiedervorlage|Beilage|beilegen|Anlage|anbei"
+"|beigefügt|anhängend"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
-msgid "Geary will not add or update this email account."
-msgstr "Geary wird dieses E-Mail-Konto nicht hinzufügen oder aktualisieren"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Möchten Sie diese Nachricht verwerfen?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-"this account."
-msgstr ""
-"Wenn Sie »Diesem Server nicht vertrauen« auswählen, wird Geary nicht auf "
-"dieses Konto zugreifen."
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Nachricht ohne Betreff und Inhalt senden?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr ""
-"Geary wird beendet, falls Sie keine anderen offenen E-Mail-Konten haben."
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Nachricht ohne Betreff senden?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
-msgid ""
-"Contact your system administrator or email service provider if you have any "
-"question about these issues."
-msgstr ""
-"Kontaktieren Sie Ihren Systemadministrator oder E-Mail-Provider, falls Sie "
-"irgendwelche Fragen zu diesen Problemen haben."
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Nachricht ohne Inhalt senden?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
-msgstr ""
-"Das Server-Zertifikat wurde von keiner bekannten Zertifizierungsstelle "
-"signiert"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Nachricht ohne Anhang senden?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
-msgid "The server's identity does not match the identity in the certificate"
-msgstr ""
-"Die Identität des Servers stimmt nicht mit der Identität im Zertifikat "
-"überein"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Anhang kann nicht hinzugefügt werden"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
-msgid "The server's certificate has expired"
-msgstr "Das Zertifikat des Servers ist abgelaufen"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "»%s« konnte nicht gefunden werden."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
-msgid "The server's certificate has not been activated"
-msgstr "Das Zertifikat des Servers wurde nicht aktiviert"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "»%s« ist ein Ordner."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
-msgid "The server's certificate has been revoked and is now invalid"
-msgstr "Das Zertifikat des Servers wurde widerrufen und ist jetzt ungültig"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "»%s« ist eine leere Datei."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
-msgid "The server's certificate is considered insecure"
-msgstr "Das Zertifikat des Servers wird als unsicher erachtet"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "»%s« konnte nicht zum Lesen geöffnet werden."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
-msgid "An error has occurred processing the server's certificate"
-msgstr ""
-"Ein Fehler ist während der Bearbeitung des Server-Zertifikats aufgetreten"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "»%s« ist bereits als Anhang ausgewählt worden."
 
-#. 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 "Geary requires your email password to continue"
-msgstr "Geary benötigt Ihr E-Mail-Passwort, um fortzufahren"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. 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 Nachricht"
-msgstr[1] "%d Nachrichten"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "An: "
 
-#. / 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 ungelesen"
-msgstr[1] "%d ungelesen"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Cc: "
 
-#. / 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/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Bcc: "
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Posteingänge"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "Antwort an: "
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d Ergebnis"
-msgstr[1] "%d Ergebnisse"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Farbe auswählen"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Neue Nachrichten"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr "%1$s über %2$s"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d neue Nachricht"
-msgstr[1] "%d neue Nachrichten"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_Von:"
 
-#: ../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] "%s, insgesamt %d neue Nachricht"
-msgstr[1] "%s, insegesamt %d neue Nachrichten"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 andere neue Nachricht für %s)"
-msgstr[1] ""
-"%s\n"
-"(%d andere neue Nachrichten für %s)"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Senden …"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Öffnen"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i Treffer"
+msgstr[1] "%i Treffer"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i Treffer (gefaltet)"
+msgstr[1] "%i Treffer (gefaltet)"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "nicht gefunden"
 
-#. / 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"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_OK"
 
-#. / 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"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Abbrechen"
 
-#. / 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"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Schließen"
 
-#. / 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 um %-l:%M %P"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Verwerfen"
 
-#. / 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"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Öffnen"
 
-#. / 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"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Drucken …"
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Jetzt"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Entfernen"
 
-#: ../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "vor %dm"
-msgstr[1] "vor %dm"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Behalten"
 
-#: ../src/client/util/util-date.vala:171
-#, c-format
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "vor %dh"
-msgstr[1] "vor %dh"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Alle E-Mails dieses Kontos nach Stichworten durchsuchen (Strg+S)"
 
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "Gestern"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "%s-Konto indizieren"
 
-#. / 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"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(kein Betreff)"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary Mail"
 
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "Bytes"
+#~ msgid "Send and receive email"
+#~ msgstr "Senden und empfangen"
 
-#: ../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Email;E-Mail;Mail;"
 
-#: ../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#~ msgid "Compose Message"
+#~ msgstr "Nachricht verfassen"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#~ msgid "Send by email"
+#~ msgstr "Als E-Mail versenden"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#~ msgid "Send files using Geary"
+#~ msgstr "Dateien mit Geary versenden"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#~ msgid "_Donate"
+#~ msgstr "_Spenden"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Konto konnte nicht entfernt "
+#~ "werden</span> "
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Ein Fenster, in dem eine mit diesem Konto verknüpfte E-Mail verfasst wird, "
+#~ "ist bereits offen.\n"
+#~ "Senden Sie diese Nachricht oder verwerfen Sie sie, und versuchen Sie es dann "
+#~ "erneut."
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Andere"
+#~ msgid "Add account"
+#~ msgstr "Konto hinzufügen"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#~ msgid "Edit account"
+#~ msgstr "Konto bearbeiten"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#~ msgid "Remove account"
+#~ msgstr "Konto entfernen"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Posteingang"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Bitte warten, bis Geary Ihr Konto bestätigt hat."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Entwürfe"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Nicht vertrauenswürdige Verbindung"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Gesendete E-Mails"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "Diesem Server _immer vertrauen"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Markiert"
+#~ msgid "_Trust This Server"
+#~ msgstr "Diesem Server _vertrauen"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Wichtig"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "Diesem Server _nicht vertrauen"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Alle E-Mails"
+#~ msgid "_Undo"
+#~ msgstr "_Rückgängig machen"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Spam"
+#~ msgid "_Redo"
+#~ msgstr "_Wiederholen"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Papierkorb"
+#~ msgid "Cu_t"
+#~ msgstr "Aus_schneiden"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Postausgang"
+#~ msgid "_Paste"
+#~ msgstr "_Einfügen"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Archivieren"
+#~ msgid "_Left"
+#~ msgstr "_Links"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-msgstr "Nichts"
+#~ msgid "_Right"
+#~ msgstr "_Rechts"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-msgid "attachment"
-msgstr "Anhang"
+#~ msgid "_Center"
+#~ msgstr "_Zentriert"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
-msgstr "bcc"
+#~ msgid "_Justify"
+#~ msgstr "_Blocksatz"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
-msgstr "Nachricht"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Link (Strg+L)"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "cc"
-msgstr "cc:"
+#~ msgid "C_olor"
+#~ msgstr "F_arbe"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
-msgstr "von"
+#~ msgid "More options"
+#~ msgstr "Weitere Optionen"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-msgid "subject"
-msgstr "Betreff"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Text einrücken (Strg+])"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
-msgstr "an"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Einrückung aufheben (Strg+[)"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
-msgstr "mir"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Formatierung löschen (Strg+Leertaste)"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-msgid "Drafts | Draft"
-msgstr "Entwürfe | Entwurf"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Mit _Formatierung einfügen"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr ""
-"Gesendet | Gesendete E-Mail | Gesendete E-Mails | Sent | Sent Mail | Sent "
-"Email | Sent E-Mail"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Fett (Strg+B)"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
-msgstr ""
-"Ungewünscht | Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail "
-"| Bulk Email | Bulk E-Mail"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Kursiv (Strg+I)"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Papierkorb | Müll | Trash | Rubbish | Rubbish Bin"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Unterstrichen (Strg+U)"
 
-#. List of folder names to match for Archive, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
-msgid "Archive | Archives"
-msgstr "Archiv | Archive | Archive | Archives"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Durchgestrichen (Strg+K)"
 
-#. / 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:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %-e. %b, %Y um %-l:%M %p"
+#~ msgid "_Rich Text"
+#~ msgstr "_Formatierter Text"
 
-#. / 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:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "Am %1$s schrieb %2$s:"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Erweiterte Felder anzeigen"
 
-#. / 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:228
-#, c-format
-msgid "%s wrote:"
-msgstr "%s schrieb:"
+#~ msgctxt "Label"
+#~ msgid "Close and Save"
+#~ msgstr "Schließen und speichern"
 
-#. / 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:234
-#, c-format
-msgid "On %s:"
-msgstr "Am %s:"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "Schließen und speichern"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Weitergeleitete Nachricht ----------"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "Schließen und speichern"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "Von: %s\n"
+#~ msgctxt "Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Schließen und verwerfen"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Betreff: %s\n"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Schließen und verwerfen"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "Datum: %s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "Schließen und verwerfen"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "An: %s\n"
+#~ msgid "Lar_ge"
+#~ msgstr "Gr_oß"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Cc: %s\n"
+#~ msgid "Large"
+#~ msgstr "Groß"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Konto konnte nicht entfernt werden</"
-"span>"
+#~ msgid "_Medium"
+#~ msgstr "_Normal"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Ein Fenster, in dem eine mit diesem Konto verknüpfte E-Mail verfasst wird, "
-"ist bereits offen.\n"
-"Senden Sie diese Nachricht oder verwerfen Sie sie, und versuchen Sie es dann "
-"erneut."
+#~ msgid "Medium"
+#~ msgstr "Mittel"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Konto hinzufügen"
+#~ msgid "_Small"
+#~ msgstr "_Klein"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Konto bearbeiten"
+#~ msgid "Small"
+#~ msgstr "Klein"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Konto entfernen"
+#~ msgid "S_ans Serif"
+#~ msgstr "S_ans Serif"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Bitte warten, bis Geary Ihr Konto bestätigt hat."
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Nicht vertrauenswürdige Verbindung"
+#~ msgid "S_erif"
+#~ msgstr "S_erif"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "Diesem Server _immer vertrauen"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "Diesem Server _vertrauen"
+#~ msgid "_Fixed Width"
+#~ msgstr "_Feste Breite"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "Diesem Server _nicht vertrauen"
+#~ msgid "Fixed Width"
+#~ msgstr "Feste Breite"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Rückgängig machen"
-
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Wiederholen"
-
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "Aus_schneiden"
-
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "_Einfügen"
-
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Links"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Rechts"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Zentriert"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Blocksatz"
-
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Link (Strg+L)"
-
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "F_arbe"
-
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Weitere Optionen"
-
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Text einrücken (Strg+])"
-
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Einrückung aufheben (Strg+[)"
-
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Formatierung löschen (Strg+Leertaste)"
-
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Mit _Formatierung einfügen"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Fett (Strg+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Kursiv (Strg+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Unterstrichen (Strg+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Durchgestrichen (Strg+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "_Formatierter Text"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Erweiterte Felder anzeigen"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "Schließen und speichern"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "Schließen und speichern"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "Schließen und speichern"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "Schließen und verwerfen"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "Schließen und verwerfen"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "Schließen und verwerfen"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "Gr_oß"
-
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "Groß"
-
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "_Normal"
-
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "Mittel"
-
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "_Klein"
-
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "Klein"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
-
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "S_erif"
-
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "Serif"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "_Feste Breite"
-
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "Feste Breite"
-
-#: ../ui/composer.glade.h:42
-msgid "Detach"
-msgstr "Loslösen"
-
-#: ../ui/composer.glade.h:43
-msgid "Detach (Ctrl+D)"
-msgstr "Loslösen (Strg+D)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_Senden"
-
-#: ../ui/composer.glade.h:45
-msgid "Send"
-msgstr "Senden"
-
-#: ../ui/composer.glade.h:46
-msgid "Send (Ctrl+Enter)"
-msgstr "Senden (Strg+Eingabetaste)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "_Datei anhängen"
-
-#: ../ui/composer.glade.h:48
-msgid "Attach File"
-msgstr "Datei anhängen"
-
-#: ../ui/composer.glade.h:49
-msgid "_Include Original Attachments"
-msgstr "_Ursprüngliche Anhänge übernehmen"
-
-#: ../ui/composer.glade.h:50
-msgid "Include Original Attachments"
-msgstr "Ursprüngliche Anhänge übernehmen"
-
-#: ../ui/composer.glade.h:51
-msgid "Application Menu"
-msgstr "Anwendungsmenü"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:53
-msgid "_To"
-msgstr "_An"
+#~ msgid "Detach"
+#~ msgstr "Loslösen"
 
-#: ../ui/composer.glade.h:54
-msgid "_Cc"
-msgstr "_CC"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Loslösen (Strg+D)"
 
-#: ../ui/composer.glade.h:55
-msgid "_Subject"
-msgstr "_Betreff"
+#~ msgid "_Send"
+#~ msgstr "_Senden"
 
-#: ../ui/composer.glade.h:56
-msgid "_Bcc"
-msgstr "_Bcc"
+#~ msgid "Send"
+#~ msgstr "Senden"
 
-#: ../ui/composer.glade.h:57
-msgid "_Reply-To"
-msgstr "_Antworten"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Senden (Strg+Eingabetaste)"
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:59
-msgid "From"
-msgstr "Von"
+#~ msgid "_Attach File"
+#~ msgstr "_Datei anhängen"
 
-#: ../ui/composer.glade.h:60
-msgid "Drop files here"
-msgstr "Dateien hier ablegen"
+#~ msgid "Attach File"
+#~ msgstr "Datei anhängen"
 
-#: ../ui/composer.glade.h:61
-msgid "To add them as attachments"
-msgstr "Als Anhang einfügen"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Ursprüngliche Anhänge übernehmen"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-msgid "Remove email address"
-msgstr "E-Mail-Adresse entfernen"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Ursprüngliche Anhänge übernehmen"
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"Einige E-Mail-Dienste verlangen das Einrichten von zusätzlichen Adressen auf "
-"dem Server. Kontaktieren Sie Ihren E-Mail-Anbieter für weitere Informationen."
+#~ msgid "Application Menu"
+#~ msgstr "Anwendungsmenü"
 
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "_Aktualisieren"
+#~ msgid "_To"
+#~ msgstr "_An"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Suchen:"
+#~ msgid "_Cc"
+#~ msgstr "_CC"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Vorige"
+#~ msgid "_Subject"
+#~ msgstr "_Betreff"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Nächste"
+#~ msgid "_Bcc"
+#~ msgstr "_Bcc"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Groß-/ Kleinschreibung"
+#~ msgid "_Reply-To"
+#~ msgstr "_Antworten"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "Beschriftung"
+#~ msgid "From"
+#~ msgstr "Von"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Passwort"
+#~ msgid "Drop files here"
+#~ msgstr "Dateien hier ablegen"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "E-_Mail-Adresse"
+#~ msgid "To add them as attachments"
+#~ msgstr "Als Anhang einfügen"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Passwort"
+#~ msgid "Remove email address"
+#~ msgstr "E-Mail-Adresse entfernen"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "Di_enst"
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "Einige E-Mail-Dienste verlangen das Einrichten von zusätzlichen Adressen auf "
+#~ "dem Server. Kontaktieren Sie Ihren E-Mail-Anbieter für weitere Informationen."
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "N_ame"
+#~ msgid "_Update"
+#~ msgstr "_Aktualisieren"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "N_ickname"
+#~ msgid "Find:"
+#~ msgstr "Suchen:"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Arbeit, Zuhause, etc."
+#~ msgid "_Previous"
+#~ msgstr "_Vorige"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "Gesendete E-Mail _speichern"
+#~ msgid "_Next"
+#~ msgstr "_Nächste"
 
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
-msgstr "Zusätzliche _E-Mail-Adressen …"
+#~ msgid "_Case sensitive"
+#~ msgstr "_Groß-/ Kleinschreibung"
 
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "IMAP-Einstellungen"
+#~ msgid "label"
+#~ msgstr "Beschriftung"
 
-#: ../ui/login.glade.h:12
-msgid "Se_rver"
-msgstr "Se_rver"
+#~ msgid "Password"
+#~ msgstr "Passwort"
 
-#: ../ui/login.glade.h:13
-msgid "P_ort"
-msgstr "P_ort"
+#~ msgid "E_mail address"
+#~ msgstr "E-_Mail-Adresse"
 
-#: ../ui/login.glade.h:14
-msgid "Ser_ver"
-msgstr "Ser_ver"
+#~ msgid "_Password"
+#~ msgstr "_Passwort"
 
-#: ../ui/login.glade.h:15
-msgid "Por_t"
-msgstr "Por_t"
+#~ msgid "S_ervice"
+#~ msgstr "Di_enst"
 
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "SMTP Einstellungen"
+#~ msgid "N_ame"
+#~ msgstr "N_ame"
 
-#: ../ui/login.glade.h:17
-msgid "User_name"
-msgstr "Be_nutzername"
+#~ msgid "N_ickname"
+#~ msgstr "N_ickname"
 
-#: ../ui/login.glade.h:18
-msgid "Pass_word"
-msgstr "Pass_wort"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Arbeit, Zuhause, etc."
 
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr "SMTP-Benutzername"
+#~ msgid "_Save sent mail"
+#~ msgstr "Gesendete E-Mail _speichern"
 
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr "SMTP-Passwort"
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "Zusätzliche _E-Mail-Adressen …"
 
-#: ../ui/login.glade.h:21
-msgid "_Username"
-msgstr "Ben_utzername"
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP-Einstellungen"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr "IMAP-Benutzername"
+#~ msgid "Se_rver"
+#~ msgstr "Se_rver"
 
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr "IMAP-Passwort"
+#~ msgid "P_ort"
+#~ msgstr "P_ort"
 
-#: ../ui/login.glade.h:24
-msgid "Encr_yption"
-msgstr "_Verschlüsselung"
+#~ msgid "Ser_ver"
+#~ msgstr "Ser_ver"
 
-#: ../ui/login.glade.h:25
-msgid "Encrypt_ion"
-msgstr "_Verschlüsselung"
+#~ msgid "Por_t"
+#~ msgstr "Por_t"
 
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP Einstellungen"
 
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "User_name"
+#~ msgstr "Be_nutzername"
 
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "Keine Authentifizierung nötig"
+#~ msgid "Pass_word"
+#~ msgstr "Pass_wort"
 
-#: ../ui/login.glade.h:30
-msgid "Use IMAP cre_dentials"
-msgstr "_IMAP-Zugangsinformationen verwenden"
+#~ msgid "SMTP username"
+#~ msgstr "SMTP-Benutzername"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Verfassen"
+#~ msgid "SMTP password"
+#~ msgstr "SMTP-Passwort"
 
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr "_Entwürfe auf dem Server speichern"
+#~ msgid "_Username"
+#~ msgstr "Ben_utzername"
 
-#: ../ui/login.glade.h:33
-msgid "Si_gn emails (HTML allowed):"
-msgstr "E-Mails _unterzeichnen (HTML erlaubt):"
+#~ msgid "IMAP username"
+#~ msgstr "IMAP-Benutzername"
 
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "Speicher"
+#~ msgid "IMAP password"
+#~ msgstr "IMAP-Passwort"
 
-#: ../ui/login.glade.h:35
-msgid "_Download mail"
-msgstr "_Mail herunterladen"
+#~ msgid "Encr_yption"
+#~ msgstr "_Verschlüsselung"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "SMTP-Einstellungen"
+#~ msgid "Encrypt_ion"
+#~ msgstr "_Verschlüsselung"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "Benutzername"
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Passwort speichern"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Legitimieren"
+#~ msgid "No authentication re_quired"
+#~ msgstr "Keine Authentifizierung nötig"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Lesen"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "_IMAP-Zugangsinformationen verwenden"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "Automatisch die nächste Nachricht _wählen"
+#~ msgid "Composer"
+#~ msgstr "Verfassen"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "Konversations_vorschau anzeigen"
+#~ msgid "Save dra_fts on server"
+#~ msgstr "_Entwürfe auf dem Server speichern"
 
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr "_Dreispaltige Ansicht verwenden"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "E-Mails _unterzeichnen (HTML erlaubt):"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "_Rechtschreibprüfung aktivieren"
+#~ msgid "Storage"
+#~ msgstr "Speicher"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "Benachrichtungen"
+#~ msgid "_Download mail"
+#~ msgstr "_Mail herunterladen"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "_Benachrichtigungstöne abspielen"
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP-Einstellungen"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "Benachrichtigung bei _neuen E-Mails anzeigen"
+#~ msgid "Username"
+#~ msgstr "Benutzername"
 
-#: ../ui/preferences.glade.h:10
-msgid "Always _watch for new mail"
-msgstr "_Ständig nach neuen E-Mails prüfen"
+#~ msgid "_Remember password"
+#~ msgstr "_Passwort speichern"
 
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr "Geary im Hintergrund ausführen und bei neuen E-Mail benachrichtigen"
+#~ msgid "_Authenticate"
+#~ msgstr "_Legitimieren"
 
-#: ../ui/preferences.glade.h:12
-msgid "Preferences"
-msgstr "Einstellungen"
+#~ msgid "Reading"
+#~ msgstr "Lesen"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Sind Sie sicher, dass Sie dieses Konto "
-"löschen wollen?</span>"
+#~ msgid "_Automatically select next message"
+#~ msgstr "Automatisch die nächste Nachricht _wählen"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Alle E-Mails, die mit diesem Konto verknüpft sind, werden von Ihrem Computer "
-"entfernt.\n"
-"Die auf dem Server gespeicherten E-Mails bleiben erhalten."
+#~ msgid "_Display conversation preview"
+#~ msgstr "Konversations_vorschau anzeigen"
+
+#~ msgid "Use _three pane view"
+#~ msgstr "_Dreispaltige Ansicht verwenden"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "_Rechtschreibprüfung aktivieren"
+
+#~ msgid "Notifications"
+#~ msgstr "Benachrichtungen"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Benachrichtigungstöne abspielen"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Benachrichtigung bei _neuen E-Mails anzeigen"
+
+#~ msgid "Always _watch for new mail"
+#~ msgstr "_Ständig nach neuen E-Mails prüfen"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr "Geary im Hintergrund ausführen und bei neuen E-Mail benachrichtigen"
+
+#~ msgid "Preferences"
+#~ msgstr "Einstellungen"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Sind Sie sicher, dass Sie dieses Konto "
+#~ "löschen wollen?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Alle E-Mails, die mit diesem Konto verknüpft sind, werden von Ihrem Computer "
+#~ "entfernt.\n"
+#~ "Die auf dem Server gespeicherten E-Mails bleiben erhalten."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Nickname:"
+#~ msgid "Nickname:"
+#~ msgstr "Nickname:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "E-Mail-Adresse:"
+#~ msgid "Email address:"
+#~ msgstr "E-Mail-Adresse:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Aktualisierung von Geary wird durchgeführt …"
+#~ msgid "Geary update in progress…"
+#~ msgstr "Aktualisierung von Geary wird durchgeführt …"
 
 #~ msgid "_Delete"
 #~ msgstr "_Löschen"
diff --git a/po/el.po b/po/el.po
index 41da7ad..c7cdf47 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10,426 +10,435 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-11-11 23:29+0000\n"
-"PO-Revision-Date: 2014-11-17 12:04+0200\n"
-"Last-Translator: Tom Tryfonidis <tomtryf gmail com>\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:00+0000\n"
+"Last-Translator: Tom Tryfonidis <Unknown>\n"
 "Language-Team: www.gnome.gr\n"
-"Language: el\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: Poedit 1.6.10\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:54+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
 "X-Project-Style: gnome\n"
+"Language: el\n"
 
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Πελάτης αλληλογραφίας"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Αλληλογραφία Geary"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Αποστολή και λήψη ηλεκτρονικού ταχυδρομείου"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "μήνυμα;ηλεκτρονικό ταχυδρομείο;αλληλογραφία;Email;E-mail;Mail;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Σύνθεση μηνύματος"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Αποστολή μέσω ηλεκτρονικού ταχυδρομείου"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Πρόχειρα | Πρόχειρο | Drafts | Draft"
 
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Αποστολή αρχείων χρησιμοποιώντας το Geary"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
+"Απεσταλμένα | Απεσταλμένα μηνύματα | Απεσταλμένα μηνύματα ηλ. ταχυδρομείου | "
+"Sent | Sent Mail | Sent Email | Sent E-Mail"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Αποθήκευση"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+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"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Προσθήκη"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr ""
+"Απορρίμματα | Κάδος απορριμμάτων | Κάδος Ανακύκλωσης | Trash | Rubbish | "
+"Rubbish Bin"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:19
-msgid "Accounts"
-msgstr "Λογαριασμοί"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#. Copyright 2011-2014 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Όνομα επώνυμο"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Εισερχόμενα"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-msgid "Welcome to Geary."
-msgstr "Καλώς ήρθατε στο Geary."
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Πρόχειρα"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-msgid "Enter your account information to get started."
-msgstr "Εισάγετε τα στοιχεία του λογαριασμού σας για να ξεκινήσετε."
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Απεσταλμένα"
 
-#: ../src/client/accounts/add-edit-page.vala:247
-msgid "2 weeks back"
-msgstr "πριν 2 εβδομάδες"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Διακεκριμένα"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:248
-msgid "1 month back"
-msgstr "πριν 1 μήνα"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Σημαντικό"
 
-#: ../src/client/accounts/add-edit-page.vala:249
-msgid "3 months back"
-msgstr "πριν 3 μήνες"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Όλο το ταχυδρομείο"
 
-#: ../src/client/accounts/add-edit-page.vala:250
-msgid "6 months back"
-msgstr "πριν 6 μήνες"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Ανεπιθύμητα"
 
-#: ../src/client/accounts/add-edit-page.vala:251
-msgid "1 year back"
-msgstr "πριν 1 χρόνο"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Απορρίμματα"
 
-#: ../src/client/accounts/add-edit-page.vala:252
-msgid "2 years back"
-msgstr "πριν 2 χρόνια"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Εξερχόμενα"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "4 years back"
-msgstr "πριν 4 χρόνια"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Αναζήτηση"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "Everything"
-msgstr "Όλα"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Αρχειοθέτηση"
 
-#: ../src/client/accounts/add-edit-page.vala:686
-msgid "Remem_ber passwords"
-msgstr "Απο_μνημόνευση κωδικών πρόσβασης"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Kανένας"
 
-#: ../src/client/accounts/add-edit-page.vala:693 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "Απο_μνημόνευση κωδικού πρόσβασης"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:727
-msgid "Unable to validate:\n"
-msgstr "Δεν ήταν δυνατή η επικύρωση:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:729
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Μη έγκυρο ψευδώνυμο λογαριασμού.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:732
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr ""
-"        &#8226; Η διεύθυνση ηλεκτρονικού ταχυδρομείου είναι ήδη καταχωρημένη "
-"στο Geary.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Αλληλογραφία Yahoo!"
 
-#: ../src/client/accounts/add-edit-page.vala:736
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; Σφάλμα σύνδεσης IMAP.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:739
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; Λάθος όνομα χρήστη ή κωδικός πρόσβασης IMAP.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Άλλος"
 
-#: ../src/client/accounts/add-edit-page.vala:742
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; Σφάλμα σύνδεσης SMTP.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "συνημμένο"
 
-#: ../src/client/accounts/add-edit-page.vala:745
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; Λάθος όνομα χρήστη ή κωδικός πρόσβασης για το SMTP.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "κρυφή κοινοποίηση"
 
-#: ../src/client/accounts/add-edit-page.vala:749
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Σφάλμα σύνδεσης.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "σώμα"
 
-#: ../src/client/accounts/add-edit-page.vala:753
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Λάθος όνομα χρήστη ή κωδικός πρόσβασης.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "κοινοποίηση"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2014 Yorba Foundation"
-msgstr "Πνευματική ιδιοκτησία 2011-2014 Ίδρυμα Yorba"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "από"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Επισκεφθείτε την ιστοσελίδα του Yorba"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "Θέμα"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Εκκίνηση του Geary με κρυφό κύριο παράθυρο"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "προς"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Εμφάνιση πληροφοριών αποσφαλμάτωσης"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "εμένα"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Καταγραφή παρακολούθησης της συνομιλίας"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(χωρίς θέμα)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Καταγραφή δραματοποίησης δικτύου"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %-e %b, %Y at %-l:%M %p"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Καταγραφή δραστηριότητας του δικτύου"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "Στις %1$s, ο/η %2$s έγραψε:"
 
-#. / 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 "Καταγραφή ουράς επανάληψης IMAP"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s έγραψε:"
 
-#. / 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 "Καταγραφή δραματοποίησης δικτύου"
+#. / 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:234
+msgid "On %s:"
+msgstr "Στις %s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Καταγραφή περιοδικής δραστηριότητας"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Προωθημένο μήνυμα ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Καταγραφή ερωτημάτων βάσης δεδομένων (παράγει πολλά μηνύματα)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Από: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Καταγραφή ομαλοποίησης φάκελου"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Θέμα %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Να επιτρέπεται η επιθεώρηση του WebView"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Ημερομηνία:%s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Ανάκληση όλων των πιστοποιητικών διακομιστή με προειδοποιήσεις TLS"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Προς: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Εμφάνιση έκδοσης του προγράμματος"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Κοινοποίηση: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Χρησιμοποιήστε το % s για να ανοίξετε ένα νέο παράθυρο σύνθεσης"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "Κανένα"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Παρακαλούμε αναφέρετε σχόλια, προτάσεις και σφάλματα σε:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Πελάτης αλληλογραφίας"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Απέτυχε να αναλύσει τις επιλογές της γραμμής εντολών: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Άγνωστη επιλογή της γραμμής εντολών \"%s\"\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Επισκεφθείτε την ιστοσελίδα του Yorba"
 
-#: ../src/client/application/geary-controller.vala:56
-msgid "_Delete"
-msgstr "_Διαγραφή"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Διαγραφή συνομιλίας (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Διαγραφή συνομιλιών (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:62
-msgid "_Trash"
-msgstr "Απο_ρρίμματα"
-
-#: ../src/client/application/geary-controller.vala:63
-msgid "Move conversation to trash (Delete, Backspace)"
-msgstr "Μετακίνηση συνομιλίας στα απορρίμματα (Delete, Backspace)"
-
-#: ../src/client/application/geary-controller.vala:64
-msgid "Move conversations to trash (Delete, Backspace)"
-msgstr "Μετακίνηση συνομιλιών στα απορρίμματα (Delete, Backspace)"
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr ""
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
 #: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Αρχείο"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Αρχειοθέτηση συνομιλίας (Α)"
 
-#: ../src/client/application/geary-controller.vala:70
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Αρχειοθέτηση συνομιλιών (Α)"
 
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Σημείωση ως ανεπι_θύμητα"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Σημείωση ως μη ανεπιθύ_μητα"
 
-#: ../src/client/application/geary-controller.vala:76
-#: ../src/client/application/geary-controller.vala:296
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Σήμανση συνομιλίας"
 
-#: ../src/client/application/geary-controller.vala:77
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Σήμανση συνομιλιών"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Προσθήκη ετικέτας στην συνομιλία"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Προσθήκη ετικέτας στις συνομιλίες"
 
-#: ../src/client/application/geary-controller.vala:80
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Μετακίνηση συνομιλίας"
 
-#: ../src/client/application/geary-controller.vala:81
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Μετακίνηση συνομιλιών"
 
-#: ../src/client/application/geary-controller.vala:272
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "Λ_ογαριασμοί"
 
-#: ../src/client/application/geary-controller.vala:277
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Προτιμήσεις"
 
-#: ../src/client/application/geary-controller.vala:281
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../src/client/application/geary-controller.vala:285
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "Σ_χετικά με"
 
-#: ../src/client/application/geary-controller.vala:289
-msgid "_Donate"
-msgstr "_Δωρεά"
-
-#: ../src/client/application/geary-controller.vala:293
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "Έ_ξοδος"
 
-#: ../src/client/application/geary-controller.vala:298
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Σήμανση ως..."
 
-#: ../src/client/application/geary-controller.vala:304
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Σήμανση ως α_ναγνωσμένο"
 
-#: ../src/client/application/geary-controller.vala:310
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Σήμανση ως α_διάβαστο"
 
-#: ../src/client/application/geary-controller.vala:316
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Αστέρι"
 
-#: ../src/client/application/geary-controller.vala:321
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "Κα_τάργηση αστεριού"
 
-#: ../src/client/application/geary-controller.vala:331
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Προσθήκη ετικέτας"
 
-#: ../src/client/application/geary-controller.vala:332
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Ετικέτα"
 
-#: ../src/client/application/geary-controller.vala:336
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Μετακίνηση"
 
-#: ../src/client/application/geary-controller.vala:340
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Σύνθεση νέου μηνύματος (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:344
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1730
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Απάντηση"
 
-#: ../src/client/application/geary-controller.vala:345
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Απάντηση (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:349
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "Α_πάντηση σε όλους"
 
-#: ../src/client/application/geary-controller.vala:350
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Απάντηση σε όλους (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:355
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1740
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Μπροστά"
 
-#: ../src/client/application/geary-controller.vala:356
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Προώθηση (Ctrl+F, F)"
 
-#: ../src/client/application/geary-controller.vala:624
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Αδυναμία αποθήκευσης της εξαίρεσης εμπιστοσύνης του διακομιστή"
 
-#: ../src/client/application/geary-controller.vala:861
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Οι ρυθμίσεις σας είναι επισφαλείς"
 
-#: ../src/client/application/geary-controller.vala:862
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -440,17 +449,17 @@ msgstr ""
 "διαβαστεί από άλλο άτομο στο δίκτυο. Είστε βέβαιοι ότι θέλετε να το κάνετε "
 "αυτό;"
 
-#: ../src/client/application/geary-controller.vala:863
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "Συ_νεχίστε"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:941
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Σφάλμα κατά την αποστολή του μηνύματος"
 
-#: ../src/client/application/geary-controller.vala:942
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -459,14 +468,12 @@ msgstr ""
 "επιμένει, παρακαλούμε διαγράψτε χειροκίνητα το μήνυμα από τον φάκελο "
 "εξερχομένων."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:946
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Σφάλμα κατά την αποθήκευση του μηνύματος"
 
-#: ../src/client/application/geary-controller.vala:947
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -475,20 +482,15 @@ msgstr ""
 "μηνύματος. Το μήνυμα θα παραμείνει στο φάκελο Εξερχόμενα μέχρι να το "
 "διαγράψετε."
 
-#: ../src/client/application/geary-controller.vala:1016
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Ετικέτες"
 
-#. 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:1028
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Αδύνατο το άνοιγμα της βάσης δεδομένων για το %s"
 
-#: ../src/client/application/geary-controller.vala:1029
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -513,21 +515,19 @@ msgstr ""
 "και τα συνημμένα της. <b>Η αλληλογραφία στον διακομιστή σας δεν θα "
 "επηρεαστεί.</b>"
 
-#: ../src/client/application/geary-controller.vala:1031
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "Αναδόμη_ση"
 
-#: ../src/client/application/geary-controller.vala:1031
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "Έ_ξοδος"
 
-#: ../src/client/application/geary-controller.vala:1040
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Αδύνατη η αναδόμηση της βάσης δεδομένων για το \"%s\""
 
-#: ../src/client/application/geary-controller.vala:1041
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -537,17 +537,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1063
-#: ../src/client/application/geary-controller.vala:1073
-#: ../src/client/application/geary-controller.vala:1084
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Αδύνατο το άνοιγμα του τοπικού γραμματοκιβωτίου για το %s"
 
-#: ../src/client/application/geary-controller.vala:1064
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -566,7 +562,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -580,7 +576,7 @@ msgstr ""
 "\n"
 "Παρακαλούμε εγκαταστήστε την τελευταία έκδοση του Geary και ξαναδοκιμάστε."
 
-#: ../src/client/application/geary-controller.vala:1085
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -592,14 +588,13 @@ msgstr ""
 "\n"
 "Παρακαλούμε ελέγξτε τη σύνδεση δικτύου και επανεκκινήστε το Geary."
 
-#: ../src/client/application/geary-controller.vala:1592
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "Σχετικά %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1595
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
 msgstr ""
 "Ελληνική μεταφραστική ομάδα GNOME\n"
@@ -610,14 +605,20 @@ msgstr ""
 " Μαρία Μαυρίδου <mavridou gmail com>\n"
 "\n"
 "Για περισσότερες πληροφορίες, επισκεφθείτε τη σελίδα\n"
-"http://gnome.gr/";
+"http://gnome.gr/\n";
+"\n"
+"Launchpad Contributions:\n"
+"  Tom Tryfonidis https://launchpad.net/~thanostx";
+
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1859
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Είστε βέβαιοι ότι θέλετε να ανοίξετε το \"%s\";"
 
-#: ../src/client/application/geary-controller.vala:1860
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -625,446 +626,188 @@ msgstr ""
 "Τα συνημμένα μπορεί να προκαλέσουν βλάβη στο σύστημά σας, αν ανοιχθούν. "
 "Ανοίξτε αρχεία που προέρχονται μόνο από αξιόπιστες πηγές."
 
-#: ../src/client/application/geary-controller.vala:1861
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Να μην _ερωτηθώ ξανά"
 
-#: ../src/client/application/geary-controller.vala:1879
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr "Ένα αρχείο με όνομα \"%s\" υπάρχει ήδη. Θέλετε να το αντικαταστήσετε;"
+msgstr ""
+"Ένα αρχείο με όνομα \"%s\" υπάρχει ήδη. Θέλετε να το αντικαταστήσετε;"
 
-#: ../src/client/application/geary-controller.vala:1881
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "Το αρχείο υπάρχει ήδη στο \"%s\". Η αντικατάστασή του θα αντικαταστήσει το "
 "περιεχόμενό του."
 
-#: ../src/client/application/geary-controller.vala:1884
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Αντικατάσταση"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2166
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Κλείσμο ανοιγμένων πρόχειρων μηνυμάτων;"
 
-#: ../src/client/application/geary-controller.vala:2269
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Θέλετε να διαγράψετε οριστικά αυτό το μήνυμα;"
 msgstr[1] "Θέλετε να διαγράψετε οριστικά αυτά τα μηνύματα;"
 
-#: ../src/client/application/geary-controller.vala:2271
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i ταίριασμα"
-msgstr[1] "%i ταιριάσματα"
-
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i ταίριασμα (από την αρχή)"
-msgstr[1] "%i ταιριάσματα (από την αρχή)"
-
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "δεν βρέθηκε"
-
-#: ../src/client/components/main-toolbar.vala:11
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Αναζήτηση"
-
-#. Search bar.
-#: ../src/client/components/main-toolbar.vala:78
-msgid "Search all mail in account for keywords (Ctrl+S)"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
 msgstr ""
-"Αναζητήστε όλη την αλληλογραφία σε λογαριασμό για λέξεις-κλειδιά (Ctrl+S)"
-
-#: ../src/client/components/main-toolbar.vala:210
-#, c-format
-msgid "Indexing %s account"
-msgstr "Ευρετηρίαση λογαριασμού %s"
-
-#: ../src/client/components/main-toolbar.vala:221
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Αναζήτηση λογαριασμού %s"
-
-#: ../src/client/components/main-window.vala:347
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Γίνεται η αποστολή..."
-
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_Εντάξει"
-
-#: ../src/client/components/stock.vala:19 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Ακύρωση"
-
-#: ../src/client/components/stock.vala:23 ../ui/account_list.glade.h:4
-#: ../ui/preferences.glade.h:2
-msgid "_Close"
-msgstr "_Κλείσιμο"
-
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "Απόρρι_ψη"
-
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "Άνοι_γμα"
-
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Εκτύπωση..."
-
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "Α_φαίρεση "
-
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1197
-msgid "Select _All"
-msgstr "Ε_πιλογή όλων"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "Δια_τήρηση"
-
-#: ../src/client/composer/composer-widget.vala:58
-msgid "Saved"
-msgstr "Αποθηκεύτηκε"
-
-#: ../src/client/composer/composer-widget.vala:59
-msgid "Saving"
-msgstr "Αποθηκεύεται"
-
-#: ../src/client/composer/composer-widget.vala:60
-msgid "Error saving"
-msgstr "Σφάλμα κατά την αποθήκευση"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
+msgstr ""
 
-#. A 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:121
-msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
 msgstr ""
-"επισύναψη|attaching|attaches|συνημμένο|συνημμένα|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
 
-#: ../src/client/composer/composer-widget.vala:907
-msgid "Do you want to discard the unsaved message?"
-msgstr "Θέλετε να απορρίψετε το μη αποθηκευμένο μήνυμα;"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Εκκίνηση του Geary με κρυφό κύριο παράθυρο"
 
-#: ../src/client/composer/composer-widget.vala:910
-#: ../src/client/composer/composer-widget.vala:914
-msgid "Do you want to discard this message?"
-msgstr "Θέλετε να απορρίψετε αυτό το μήνυμα;"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Εμφάνιση πληροφοριών αποσφαλμάτωσης"
 
-#: ../src/client/composer/composer-widget.vala:1027
-msgid "Send message with an empty subject and body?"
-msgstr "Να αποσταλεί το μήνυμα με κενό θέμα και περιεχόμενο;"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Καταγραφή παρακολούθησης της συνομιλίας"
 
-#: ../src/client/composer/composer-widget.vala:1029
-msgid "Send message with an empty subject?"
-msgstr "Να αποσταλεί το μήνυμα με κενό θέμα;"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Καταγραφή δραματοποίησης δικτύου"
 
-#: ../src/client/composer/composer-widget.vala:1031
-msgid "Send message with an empty body?"
-msgstr "Να αποσταλεί το μήνυμα με κενό περιεχόμενο;"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Καταγραφή δραστηριότητας του δικτύου"
 
-#: ../src/client/composer/composer-widget.vala:1033
-msgid "Send message without an attachment?"
-msgstr "Να αποσταλεί το μήνυμα χωρίς συνημμένο;"
+#. / 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 "Καταγραφή ουράς επανάληψης IMAP"
 
-#: ../src/client/composer/composer-widget.vala:1216
-msgid "Cannot add attachment"
-msgstr "Δεν είναι δυνατή η προσθήκη συνημμένου"
+#. / 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 "Καταγραφή δραματοποίησης δικτύου"
 
-#: ../src/client/composer/composer-widget.vala:1227
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "Το \"%s\" δεν ήταν δυνατό να βρεθεί."
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Καταγραφή περιοδικής δραστηριότητας"
 
-#: ../src/client/composer/composer-widget.vala:1234
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "Το \"%s\" είναι ένας φάκελος."
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Καταγραφή ερωτημάτων βάσης δεδομένων (παράγει πολλά μηνύματα)"
 
-#: ../src/client/composer/composer-widget.vala:1241
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "Το \"%s\" είναι ένα άδειο αρχείο."
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Καταγραφή ομαλοποίησης φάκελου"
 
-#: ../src/client/composer/composer-widget.vala:1255
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "Το \"%s\" δεν ήταν δυνατό να ανοιχτεί για ανάγνωση."
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Να επιτρέπεται η επιθεώρηση του WebView"
 
-#: ../src/client/composer/composer-widget.vala:1262
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "Το αρχείο \"%s\" έχει ήδη επισυναφθεί για παράδοση."
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Ανάκληση όλων των πιστοποιητικών διακομιστή με προειδοποιήσεις TLS"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1271
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Εμφάνιση έκδοσης του προγράμματος"
 
-#: ../src/client/composer/composer-widget.vala:1331
-msgid "To: "
-msgstr "Προς:"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Χρησιμοποιήστε το % s για να ανοίξετε ένα νέο παράθυρο σύνθεσης"
 
-#: ../src/client/composer/composer-widget.vala:1334
-msgid "Cc: "
-msgstr "Κοινοποίηση:"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Παρακαλούμε αναφέρετε σχόλια, προτάσεις και σφάλματα σε:"
 
-#: ../src/client/composer/composer-widget.vala:1337
-msgid "Bcc: "
-msgstr "Κρυφή κοιν.:"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Απέτυχε να αναλύσει τις επιλογές της γραμμής εντολών: %s\n"
 
-#: ../src/client/composer/composer-widget.vala:1340
-msgid "Reply-To: "
-msgstr "Απάντηση σε:"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Άγνωστη επιλογή της γραμμής εντολών \"%s\"\n"
 
-#: ../src/client/composer/composer-widget.vala:1573
-msgid "Select Color"
-msgstr "Επιλογή χρώματος"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%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:2022
-msgid "_From:"
-msgstr "_Από:"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d νέο μήνυμα"
+msgstr[1] "%d νέα μηνύματα"
 
-#. For other types of messages, just show the from account.
-#. Composer label (without mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2038
-#: ../src/client/conversation-viewer/conversation-viewer.vala:713
-msgid "From:"
-msgstr "Από:"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, συνολικά %d νέο μήνυμα"
+msgstr[1] "%s, συνολικά %d νέα μηνύματα"
 
-#. Copyright 2011-2014 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Window for sending messages.
-#: ../src/client/composer/composer-window.vala:10
-msgid "New Message"
-msgstr "Νέο μήνυμα"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d άλλο μήνυμα για το %s)"
+msgstr[1] ""
+"%s\n"
+"(%d άλλα μηνύματα για το %s)"
+
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Aνοιχτό"
 
 #: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Εγώ"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:338
-msgid "No conversations selected."
-msgstr "Δεν επιλέχθηκαν συνομιλίες."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:340
-#, c-format
-msgid "%u conversation selected."
-msgid_plural "%u conversations selected."
-msgstr[0] "%u συνομιλία επιλέχθηκε."
-msgstr[1] "%u συνομιλίες επιλέχθηκαν."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:369
-msgid "No search results found."
-msgstr "Δεν υπάρχουν αποτελέσματα."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:371
-msgid "No conversations in folder."
-msgstr "Δεν υπάρχουν συνομιλίες στον φάκελο."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:612
-msgid "This message contains remote images."
-msgstr "Αυτό το μήνυμα περιέχει απομακρυσμένες εικόνες."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:612
-msgid "Show Images"
-msgstr "Προβολή εικόνων"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:613
-msgid "Always Show From Sender"
-msgstr "Να εμφανίζεται πάντοτε ο αποστολέας"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:637
-msgid "Edit Draft"
-msgstr "Επεξεργασία πρόχειρου μηνύματος"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:716
-msgid "To:"
-msgstr "Προς:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:719
-msgid "Cc:"
-msgstr "Κοινοποίηση:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:722
-msgid "Bcc:"
-msgstr "Κρυφή κοιν.:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:725
-msgid "Subject:"
-msgstr "Θέμα:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:728
-msgid "Date:"
-msgstr "Ημερομηνία:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1012
-#, c-format
-msgid "%u read message"
-msgid_plural "%u read messages"
-msgstr[0] "%u αναγνωσμένο μήνυμα"
-msgstr[1] "%u αναγνωσμένα μηνύματα"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1144
-#, c-format
-msgid "This message was sent successfully, but could not be saved to %s."
-msgstr ""
-"Αυτό το μήνυμα στάλθηκε με επιτυχία, αλλά δεν μπόρεσε να αποθηκευτεί στο %s."
-
-#. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1170
-#: ../ui/composer.glade.h:4
-msgid "_Copy"
-msgstr "_Αντιγραφή"
-
-#. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1178
-msgid "Copy _Email Address"
-msgstr "Αντιγραφή _διεύθυνσης ηλεκτρονικού ταχυδρομείου"
-
-#. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1183
-#: ../ui/composer.glade.h:17
-msgid "Copy _Link"
-msgstr "Αντιγραφή _σύνδεσης"
-
-#. Select message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1191
-msgid "Select _Message"
-msgstr "Επιλογή _μηνύματος"
-
-#. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1203
-msgid "_Inspect"
-msgstr "_Επιθεώρηση"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1429
-msgid "This link appears to go to"
-msgstr "Αυτός ο σύνδεσμος φαίνεται να πηγαίνει στο"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1430
-msgid "but actually goes to"
-msgstr "στην πραγματικότητα όμως πάει στο"
-
-#. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1485
-msgid " (Invalid?)"
-msgstr " (Άκυρο;)"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1591
-msgid "_Save Image As..."
-msgstr "Αποθήκευ_ση εικόνας ως..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1695
-msgid "_Save As..."
-msgstr "_Αποθήκευση ως..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1700
-msgid "Save All A_ttachments..."
-msgstr "Αποθή_κευση όλων των συνημμένων..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1720
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "Αποθή_κευση συνημμένου..."
-msgstr[1] "Αποθή_κευση όλων των συνημμένων..."
-
-#. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1735
-msgid "Reply to _All"
-msgstr "Απάντηση σε ό_λους"
-
-#. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1752
-msgid "_Mark as Read"
-msgstr "_Σήμανση ως αναγνωσμένα"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1756
-msgid "_Mark as Unread"
-msgstr "_Σήμανση ως μη αναγνωσμένα"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1762
-msgid "Mark Unread From _Here"
-msgstr "Σημειώστε αδιάβαστα από ε_δώ"
-
-#. Separator.
-#. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1777
-msgid "_View Source"
-msgstr "_Προβολή προέλευσης"
-
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2101
-#: ../src/engine/rfc822/rfc822-utils.vala:331
-msgid "none"
-msgstr "Κανένα"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2236
-msgid "Failed to open default text editor."
-msgstr "Απέτυχε να ανοίξετε το προεπιλεγμένο πρόγραμμα επεξεργασίας κειμένου."
-
-#: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - Επόπτης συνομιλίας"
-
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Επιλέξτε ένα αρχείο"
-
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Επισύναψη"
-
 #: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
 msgid "Untrusted Connection: %s"
 msgstr "Αναξιόπιστη σύνδεση: %s"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
 msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr ""
 "Αδύνατη η επαλήθευση της ταυτότητας του διακομιστή αλληλογραφίας %s στο %s:%u"
@@ -1147,87 +890,137 @@ msgid "An error has occurred processing the server's certificate"
 msgstr ""
 "Παρουσιάστηκε σφάλμα κατά την επεξεργασία του πιστοποιητικού του διακομιστή"
 
-#. 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 "Geary requires your email password to continue"
 msgstr ""
 "Το Geary απαιτεί τον κωδικό πρόσβασης του ηλεκτρονικού ταχυδρομείου σας για "
 "να συνεχίσει"
 
-#. 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 μήνυμα"
-msgstr[1] "%d μηνύματα"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Επιλέξτε ένα αρχείο"
 
-#. / 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 μη αναγνωσμένο"
-msgstr[1] "%d μη αναγνωσμένα"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Επισύναψη"
 
-#. / 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/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr ""
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Εισερχόμενα"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Λογαριασμοί"
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d αποτέλεσμα"
-msgstr[1] "%d αποτελέσματα"
+#. / 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 "Όνομα επώνυμο"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Νέα μηνύματα"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Καλώς ήρθατε στο Geary."
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d νέο μήνυμα"
-msgstr[1] "%d νέα μηνύματα"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Εισάγετε τα στοιχεία του λογαριασμού σας για να ξεκινήσετε."
 
-#: ../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 νέο μήνυμα"
-msgstr[1] "%s, συνολικά %d νέα μηνύματα"
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "πριν 2 εβδομάδες"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 άλλο μήνυμα για το %s)"
-msgstr[1] ""
-"%s\n"
-"(%d άλλα μηνύματα για το %s)"
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "πριν 1 μήνα"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Aνοιχτό"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "πριν 3 μήνες"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "πριν 6 μήνες"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "πριν 1 χρόνο"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "πριν 2 χρόνια"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "πριν 4 χρόνια"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Όλα"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "Απο_μνημόνευση κωδικών πρόσβασης"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "Απο_μνημόνευση κωδικού πρόσβασης"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Δεν ήταν δυνατή η επικύρωση:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Μη έγκυρο ψευδώνυμο λογαριασμού.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr ""
+"        &#8226; Η διεύθυνση ηλεκτρονικού ταχυδρομείου είναι ήδη καταχωρημένη "
+"στο Geary.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Σφάλμα σύνδεσης IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Λάθος όνομα χρήστη ή κωδικός πρόσβασης IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Σφάλμα σύνδεσης SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr ""
+"        &#8226; Λάθος όνομα χρήστη ή κωδικός πρόσβασης για το SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Σφάλμα σύνδεσης.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Λάθος όνομα χρήστη ή κωδικός πρόσβασης.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Αποθήκευση"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Προσθήκη"
 
 #. / 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
@@ -1285,14 +1078,12 @@ msgid "Now"
 msgstr "Μόλις"
 
 #: ../src/client/util/util-date.vala:167
-#, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
 msgstr[0] "πριν %dλ"
 msgstr[1] "πριν %dλ"
 
 #: ../src/client/util/util-date.vala:171
-#, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
 msgstr[0] "πριν %dω"
@@ -1305,15 +1096,9 @@ msgstr "Χθές"
 #. / 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:30
-#: ../src/engine/rfc822/rfc822-message.vala:747
-msgid "(no subject)"
-msgstr "(χωρίς θέμα)"
-
 #: ../src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "bytes"
@@ -1338,706 +1123,768 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KB"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d μήνυμα"
+msgstr[1] "%d μηνύματα"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d μη αναγνωσμένο"
+msgstr[1] "%d μη αναγνωσμένα"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Αλληλογραφία Yahoo!"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Εισερχόμενα"
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Αναζήτηση λογαριασμού %s"
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Άλλος"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d αποτέλεσμα"
+msgstr[1] "%d αποτελέσματα"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Εισερχόμενα"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "Δεν επιλέχθηκαν συνομιλίες."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Πρόχειρα"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] "%u συνομιλία επιλέχθηκε."
+msgstr[1] "%u συνομιλίες επιλέχθηκαν."
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Απεσταλμένα"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
+msgstr "Δεν υπάρχουν αποτελέσματα."
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Διακεκριμένα"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
+msgstr "Δεν υπάρχουν συνομιλίες στον φάκελο."
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Σημαντικό"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
+msgstr "Αυτό το μήνυμα περιέχει απομακρυσμένες εικόνες."
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Όλο το ταχυδρομείο"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr "Προβολή εικόνων"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Ανεπιθύμητα"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
+msgstr "Να εμφανίζεται πάντοτε ο αποστολέας"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Απορρίμματα"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
+msgstr "Επεξεργασία πρόχειρου μηνύματος"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Εξερχόμενα"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "Από:"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Αρχειοθέτηση"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "Προς:"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:25
-msgid "None"
-msgstr "Kανένας"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Κοινοποίηση:"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:665
-msgid "attachment"
-msgstr "συνημμένο"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Κρυφή κοιν.:"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:669
-#: ../src/engine/imap-db/imap-db-account.vala:693
-msgid "bcc"
-msgstr "κρυφή κοινοποίηση"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "Θέμα:"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:673
-msgid "body"
-msgstr "σώμα"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Ημερομηνία:"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:677
-#: ../src/engine/imap-db/imap-db-account.vala:693
-msgid "cc"
-msgstr "κοινοποίηση"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] "%u αναγνωσμένο μήνυμα"
+msgstr[1] "%u αναγνωσμένα μηνύματα"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:681
-#: ../src/engine/imap-db/imap-db-account.vala:693
-msgid "from"
-msgstr "από"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
+msgstr ""
+"Αυτό το μήνυμα στάλθηκε με επιτυχία, αλλά δεν μπόρεσε να αποθηκευτεί στο %s."
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:685
-msgid "subject"
-msgstr "Θέμα"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "_Αντιγραφή"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:689
-#: ../src/engine/imap-db/imap-db-account.vala:693
-msgid "to"
-msgstr "προς"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "Αντιγραφή _διεύθυνσης ηλεκτρονικού ταχυδρομείου"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:709
-msgid "me"
-msgstr "εμένα"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "Αντιγραφή _σύνδεσης"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:535
-msgid "Drafts | Draft"
-msgstr "Πρόχειρα | Πρόχειρο | Drafts | Draft"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
+msgstr "Επιλογή _μηνύματος"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:540
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Ε_πιλογή όλων"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "_Επιθεώρηση"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr "Αυτός ο σύνδεσμος φαίνεται να πηγαίνει στο"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
+msgstr "στην πραγματικότητα όμως πάει στο"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
+msgstr " (Άκυρο;)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
+msgstr "Αποθήκευ_ση εικόνας ως..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_Αποθήκευση ως..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "Αποθή_κευση όλων των συνημμένων..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] "Αποθή_κευση συνημμένου..."
+msgstr[1] "Αποθή_κευση όλων των συνημμένων..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "Απάντηση σε ό_λους"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "_Σήμανση ως αναγνωσμένα"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "_Σήμανση ως μη αναγνωσμένα"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
+msgstr "Σημειώστε αδιάβαστα από ε_δώ"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "_Προβολή προέλευσης"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
 msgstr ""
-"Απεσταλμένα | Απεσταλμένα μηνύματα | Απεσταλμένα μηνύματα ηλ. ταχυδρομείου | "
-"Sent | Sent Mail | Sent Email | Sent E-Mail"
+"Απέτυχε να ανοίξετε το προεπιλεγμένο πρόγραμμα επεξεργασίας κειμένου."
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:545
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr "%s - Επόπτης συνομιλίας"
+
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Αποθηκεύτηκε"
+
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Αποθηκεύεται"
+
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Σφάλμα κατά την αποθήκευση"
+
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
 msgstr ""
-"Ανεπιθύμητα | Ανεπιθύμητη αλληλογραφία | Ανεπιθύμητα μηνύματα ηλεκτρονικού "
-"ταχυδρομείου | Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk "
-"Mail | Bulk Email | Bulk E-Mail"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:550
-msgid "Trash | Rubbish | Rubbish Bin"
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Νέο μήνυμα"
+
+#: ../src/client/composer/composer-widget.vala:138
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Απορρίμματα | Κάδος απορριμμάτων | Κάδος Ανακύκλωσης | Trash | Rubbish | "
-"Rubbish Bin"
+"επισύναψη|attaching|attaches|συνημμένο|συνημμένα|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 
-#. / 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:168
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %-e %b, %Y at %-l:%M %p"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Θέλετε να απορρίψετε αυτό το μήνυμα;"
 
-#. / 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:174
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "Στις %1$s, ο/η %2$s έγραψε:"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Να αποσταλεί το μήνυμα με κενό θέμα και περιεχόμενο;"
 
-#. / 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:181
-#, c-format
-msgid "%s wrote:"
-msgstr "%s έγραψε:"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Να αποσταλεί το μήνυμα με κενό θέμα;"
 
-#. / 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:187
-#, c-format
-msgid "On %s:"
-msgstr "Στις %s:"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Να αποσταλεί το μήνυμα με κενό περιεχόμενο;"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:216
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Προωθημένο μήνυμα ----------"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Να αποσταλεί το μήνυμα χωρίς συνημμένο;"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "From: %s\n"
-msgstr "Από: %s\n"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Δεν είναι δυνατή η προσθήκη συνημμένου"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:221
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Θέμα %s\n"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "Το \"%s\" δεν ήταν δυνατό να βρεθεί."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:222
-#, c-format
-msgid "Date: %s\n"
-msgstr "Ημερομηνία:%s\n"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "Το \"%s\" είναι ένας φάκελος."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:225
-#, c-format
-msgid "To: %s\n"
-msgstr "Προς: %s\n"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "Το \"%s\" είναι ένα άδειο αρχείο."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:228
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Κοινοποίηση: %s\n"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "Το \"%s\" δεν ήταν δυνατό να ανοιχτεί για ανάγνωση."
+
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "Το αρχείο \"%s\" έχει ήδη επισυναφθεί για παράδοση."
+
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Προς: "
+
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Κοινοποίηση: "
+
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Κρυφή κοιν.: "
+
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "Απάντηση σε: "
+
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Επιλογή χρώματος"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Δεν είναι δυνατή η αφαίρεση του "
-"λογαριασμού</span> "
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_Από:"
+
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Γίνεται η αποστολή..."
+
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i ταίριασμα"
+msgstr[1] "%i ταιριάσματα"
+
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i ταίριασμα (από την αρχή)"
+msgstr[1] "%i ταιριάσματα (από την αρχή)"
+
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "δεν βρέθηκε"
+
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_Εντάξει"
+
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Ακύρωση"
+
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Κλείσιμο"
+
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "Απόρρι_ψη"
+
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "Άνοι_γμα"
+
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Εκτύπωση..."
+
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "Α_φαίρεση"
+
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "Δια_τήρηση"
+
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
 msgstr ""
-"Υπάρχει ένα παράθυρο σύνθεσης μηνύματος ανοιχτό που είναι συνδεδεμένο με "
-"αυτόν τον λογαριασμό. Στείλτε το μήνυμα ή ακυρώστε το και προσπαθήστε ξανά."
+"Αναζητήστε όλη την αλληλογραφία σε λογαριασμό για λέξεις-κλειδιά (Ctrl+S)"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Προσθήκη λογαριασμού"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Ευρετηρίαση λογαριασμού %s"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Επεξεργασία λογαριασμού"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Αφαίρεση λογαριασμού"
+#~ msgid "Geary Mail"
+#~ msgstr "Αλληλογραφία Geary"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Παρακαλούμε περιμένετε όσο το Geary επικυρώνει τον λογαριασμό σας."
+#~ msgid "Send and receive email"
+#~ msgstr "Αποστολή και λήψη ηλεκτρονικού ταχυδρομείου"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Μη έμπιστη σύνδεση"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "μήνυμα;ηλεκτρονικό ταχυδρομείο;αλληλογραφία;Email;E-mail;Mail;"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "Πάντ_α εμπιστοσύνη σε αυτόν τον διακομιστή"
+#~ msgid "Compose Message"
+#~ msgstr "Σύνθεση μηνύματος"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "Έμ_πιστος διακομιστής"
+#~ msgid "Send by email"
+#~ msgstr "Αποστολή μέσω ηλεκτρονικού ταχυδρομείου"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "Μη έμπιστος _διακομιστής"
+#~ msgid "Send files using Geary"
+#~ msgstr "Αποστολή αρχείων χρησιμοποιώντας το Geary"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "Α_ναίρεση"
+#~ msgid "Copyright 2011-2014 Yorba Foundation"
+#~ msgstr "Πνευματική ιδιοκτησία 2011-2014 Ίδρυμα Yorba"
 
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "Επανάλη_ψη"
+#~ msgid "_Delete"
+#~ msgstr "_Διαγραφή"
 
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "_Αποκοπή"
+#~ msgid "_Trash"
+#~ msgstr "Απο_ρρίμματα"
 
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "_Επικόλληση"
+#~ msgid "Move conversation to trash (Delete, Backspace)"
+#~ msgstr "Μετακίνηση συνομιλίας στα απορρίμματα (Delete, Backspace)"
 
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Αριστερά"
+#~ msgid "Move conversations to trash (Delete, Backspace)"
+#~ msgstr "Μετακίνηση συνομιλιών στα απορρίμματα (Delete, Backspace)"
 
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Δεξιά"
+#~ msgid "_Donate"
+#~ msgstr "_Δωρεά"
 
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Κέντρο"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Θέλετε να απορρίψετε το μη αποθηκευμένο μήνυμα;"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Δεν είναι δυνατή η αφαίρεση του "
+#~ "λογαριασμού</span> "
 
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Πλήρης στοίχιση"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Υπάρχει ένα παράθυρο σύνθεσης μηνύματος ανοιχτό που είναι συνδεδεμένο με "
+#~ "αυτόν τον λογαριασμό. Στείλτε το μήνυμα ή ακυρώστε το και προσπαθήστε ξανά."
 
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Σύνδεσμος (Ctlr+L)"
+#~ msgid "Add account"
+#~ msgstr "Προσθήκη λογαριασμού"
 
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "Χρώμ_α"
+#~ msgid "Edit account"
+#~ msgstr "Επεξεργασία λογαριασμού"
 
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Περισσότερες επιλογές"
+#~ msgid "Remove account"
+#~ msgstr "Αφαίρεση λογαριασμού"
 
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Κείμενο παραπομπής (Ctrl+])"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Παρακαλούμε περιμένετε όσο το Geary επικυρώνει τον λογαριασμό σας."
 
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Κείμενο αφαίρεσης παραπομπής (Ctrl+[)"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Μη έμπιστη σύνδεση"
 
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Κατάργηση μορφοποίησης  (Ctrl+Space)"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "Πάντ_α εμπιστοσύνη σε αυτόν τον διακομιστή"
 
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Επικόλληση _με μορφοποίηση"
+#~ msgid "_Trust This Server"
+#~ msgstr "Έμ_πιστος διακομιστής"
 
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Έντονη γραφή (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Πλάγια γραφή (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Υπογραμμισμένη γραφή (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Επιγραμμισμένη γραφή (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "Κείμενο _πλούσιας μορφής"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Εμφάνιση εκτεταμένων πεδίων"
-
-#: ../ui/composer.glade.h:24
-msgid "Lar_ge"
-msgstr "_Μεγάλα"
-
-#: ../ui/composer.glade.h:25
-msgid "Large"
-msgstr "Μεγάλο"
-
-#: ../ui/composer.glade.h:26
-msgid "_Medium"
-msgstr "Με_σαία"
-
-#: ../ui/composer.glade.h:27
-msgid "Medium"
-msgstr "Μεσαίο"
-
-#: ../ui/composer.glade.h:28
-msgid "_Small"
-msgstr "Μι_κρά"
-
-#: ../ui/composer.glade.h:29
-msgid "Small"
-msgstr "Μικρό"
-
-#: ../ui/composer.glade.h:30
-msgid "S_ans Serif"
-msgstr "_Χωρίς πατούρα (Sans Serif)"
-
-#: ../ui/composer.glade.h:31
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: ../ui/composer.glade.h:32
-msgid "S_erif"
-msgstr "_Με πατούρα (Serif)"
-
-#: ../ui/composer.glade.h:33
-msgid "Serif"
-msgstr "Serif"
-
-#: ../ui/composer.glade.h:34
-msgid "_Fixed Width"
-msgstr "_Σταθερό πλάτος"
-
-#: ../ui/composer.glade.h:35
-msgid "Fixed Width"
-msgstr "Σταθερό πλάτος"
-
-#: ../ui/composer.glade.h:36
-msgid "Detach"
-msgstr "Απόσπαση"
-
-#: ../ui/composer.glade.h:37
-msgid "_Send"
-msgstr "Α_ποστολή"
-
-#: ../ui/composer.glade.h:38
-msgid "Send"
-msgstr "Αποστολή"
-
-#: ../ui/composer.glade.h:39
-msgid "_Attach File"
-msgstr "_Επισύναψη αρχείου"
-
-#: ../ui/composer.glade.h:40
-msgid "Attach File"
-msgstr "Επισύναψη αρχείου"
-
-#: ../ui/composer.glade.h:41
-msgid "_Include Original Attachments"
-msgstr "Να _συμπεριλαμβάνονται τα αρχικά συνημμένα"
-
-#: ../ui/composer.glade.h:42
-msgid "Include Original Attachments"
-msgstr "Να συμπεριλαμβάνονται τα αρχικά συνημμένα"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "Μη έμπιστος _διακομιστής"
 
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:44
-msgid "_To"
-msgstr "Πρ_ος"
-
-#: ../ui/composer.glade.h:45
-msgid "_Cc"
-msgstr "_Κοινοποίηση"
-
-#: ../ui/composer.glade.h:46
-msgid "_Subject"
-msgstr "_Θέμα"
-
-#: ../ui/composer.glade.h:47
-msgid "_Bcc"
-msgstr "Κρ_υφή κοιν."
-
-#: ../ui/composer.glade.h:48
-msgid "_Reply-To"
-msgstr "Απά_ντηση σε:"
-
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:50
-msgid "From"
-msgstr "Από"
+#~ msgid "_Undo"
+#~ msgstr "Α_ναίρεση"
 
-#: ../ui/composer.glade.h:51
-msgid "Drop files here"
-msgstr "Αφήστε τα αρχεία εδώ"
+#~ msgid "_Redo"
+#~ msgstr "Επανάλη_ψη"
 
-#: ../ui/composer.glade.h:52
-msgid "To add them as attachments"
-msgstr "Για να τα προσθέσετε ως συνημμένα"
+#~ msgid "Cu_t"
+#~ msgstr "_Αποκοπή"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Εύρεση:"
+#~ msgid "_Paste"
+#~ msgstr "_Επικόλληση"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Προηγούμενο"
+#~ msgid "_Left"
+#~ msgstr "_Αριστερά"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Επόμενο"
+#~ msgid "_Right"
+#~ msgstr "_Δεξιά"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Διάκριση πεζών/κεφαλαίων"
+#~ msgid "_Center"
+#~ msgstr "_Κέντρο"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "ετικέτα"
+#~ msgid "_Justify"
+#~ msgstr "_Πλήρης στοίχιση"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Κωδικός πρόσβασης"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Σύνδεσμος (Ctlr+L)"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "Διεύθυνση ηλεκτρονικού _ταχυδρομίου"
+#~ msgid "C_olor"
+#~ msgstr "Χρώμ_α"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Κωδικός πρόσβασης"
+#~ msgid "More options"
+#~ msgstr "Περισσότερες επιλογές"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "_Υπηρεσία"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Κείμενο παραπομπής (Ctrl+])"
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "Όν_ομα"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Κείμενο αφαίρεσης παραπομπής (Ctrl+[)"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "_Ψευδώνυμο"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Κατάργηση μορφοποίησης  (Ctrl+Space)"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Δουλειά, Σπίτι, κ.λπ."
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Επικόλληση _με μορφοποίηση"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "Απο_θήκευση απεσταλμένων μηνυμάτων"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Έντονη γραφή (Ctrl+B)"
 
-#: ../ui/login.glade.h:10
-msgid "IMAP settings"
-msgstr "Ρυθμίσεις IMAP"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Πλάγια γραφή (Ctrl+I)"
 
-#: ../ui/login.glade.h:11
-msgid "Se_rver"
-msgstr "Δ_ιακομιστής"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Υπογραμμισμένη γραφή (Ctrl+U)"
 
-#: ../ui/login.glade.h:12
-msgid "P_ort"
-msgstr "_Θύρα"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Επιγραμμισμένη γραφή (Ctrl+K)"
 
-#: ../ui/login.glade.h:13
-msgid "Ser_ver"
-msgstr "Δ_ιακομιστής"
+#~ msgid "_Rich Text"
+#~ msgstr "Κείμενο _πλούσιας μορφής"
 
-#: ../ui/login.glade.h:14
-msgid "Por_t"
-msgstr "Θύ_ρα"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Εμφάνιση εκτεταμένων πεδίων"
 
-#: ../ui/login.glade.h:15
-msgid "SMTP settings"
-msgstr "Ρυθμίσεις SMTP"
+#~ msgid "Lar_ge"
+#~ msgstr "_Μεγάλα"
 
-#: ../ui/login.glade.h:16
-msgid "User_name"
-msgstr "Όνομα_χρήστη"
+#~ msgid "Large"
+#~ msgstr "Μεγάλο"
 
-#: ../ui/login.glade.h:17
-msgid "Pass_word"
-msgstr "Κ_ωδικός πρόσβασης"
+#~ msgid "_Medium"
+#~ msgstr "Με_σαία"
 
-#: ../ui/login.glade.h:18
-msgid "SMTP username"
-msgstr "Όνομα χρήστη SMTP"
+#~ msgid "Medium"
+#~ msgstr "Μεσαίο"
 
-#: ../ui/login.glade.h:19
-msgid "SMTP password"
-msgstr "Κωδικός πρόσβασης SMTP"
+#~ msgid "_Small"
+#~ msgstr "Μι_κρά"
 
-#: ../ui/login.glade.h:20
-msgid "_Username"
-msgstr "Ό_νομα χρήστη"
+#~ msgid "Small"
+#~ msgstr "Μικρό"
 
-#: ../ui/login.glade.h:21
-msgid "IMAP username"
-msgstr "Όνομα χρήστη IMAP"
+#~ msgid "S_ans Serif"
+#~ msgstr "_Χωρίς πατούρα (Sans Serif)"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP password"
-msgstr "Κωδικός πρόσβασης IMAP"
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../ui/login.glade.h:23
-msgid "Encr_yption"
-msgstr "Κρυπ_τογράφηση"
+#~ msgid "S_erif"
+#~ msgstr "_Με πατούρα (Serif)"
 
-#: ../ui/login.glade.h:24
-msgid "Encrypt_ion"
-msgstr "Κρυπτογράφ_ηση"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../ui/login.glade.h:26
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "_Fixed Width"
+#~ msgstr "_Σταθερό πλάτος"
 
-#: ../ui/login.glade.h:27
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "Fixed Width"
+#~ msgstr "Σταθερό πλάτος"
 
-#: ../ui/login.glade.h:28
-msgid "No authentication re_quired"
-msgstr "Δεν απαιτείται π_ιστοποίηση"
+#~ msgid "Detach"
+#~ msgstr "Απόσπαση"
 
-#: ../ui/login.glade.h:29
-msgid "Use IMAP cre_dentials"
-msgstr "Χρήση _διαπιστευτηρίων IMAP"
+#~ msgid "_Send"
+#~ msgstr "Α_ποστολή"
 
-#: ../ui/login.glade.h:30
-msgid "Storage"
-msgstr "Αποθήκευση"
+#~ msgid "Send"
+#~ msgstr "Αποστολή"
 
-#: ../ui/login.glade.h:31
-msgid "_Download mail"
-msgstr "_Λήψη αλληλογραφίας"
+#~ msgid "_Attach File"
+#~ msgstr "_Επισύναψη αρχείου"
 
-#: ../ui/login.glade.h:32 ../ui/preferences.glade.h:6
-msgid "Composer"
-msgstr "Συνθέτης"
+#~ msgid "Attach File"
+#~ msgstr "Επισύναψη αρχείου"
 
-#: ../ui/login.glade.h:33
-msgid "Save dra_fts on server"
-msgstr "Αποθήκευση πρόχειρων στον διακομιστή"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "Να _συμπεριλαμβάνονται τα αρχικά συνημμένα"
 
-#: ../ui/login.glade.h:34
-msgid "Si_gn emails:"
-msgstr "Υπο_γραφή μηνυμάτων αλληλογραφίας:"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Να συμπεριλαμβάνονται τα αρχικά συνημμένα"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "Διαπιστευτήρια SMTP"
+#~ msgid "_To"
+#~ msgstr "Πρ_ος"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "Όνομα χρήστη"
+#~ msgid "_Cc"
+#~ msgstr "_Κοινοποίηση"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "Α_πομνημόνευση κωδικού πρόσβασης"
+#~ msgid "_Subject"
+#~ msgstr "_Θέμα"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Πιστοποίηση"
+#~ msgid "_Bcc"
+#~ msgstr "Κρ_υφή κοιν."
 
-#: ../ui/preferences.glade.h:1
-msgid "Preferences"
-msgstr "Προτιμήσεις"
+#~ msgid "_Reply-To"
+#~ msgstr "Απά_ντηση σε:"
 
-#: ../ui/preferences.glade.h:3
-msgid "Reading"
-msgstr "Aνάγνωση"
+#~ msgid "From"
+#~ msgstr "Από"
 
-#: ../ui/preferences.glade.h:4
-msgid "_Automatically select next message"
-msgstr "_Αυτόματη επιλογή επόμενου μηνύματας"
+#~ msgid "Drop files here"
+#~ msgstr "Αφήστε τα αρχεία εδώ"
 
-#: ../ui/preferences.glade.h:5
-msgid "_Display conversation preview"
-msgstr "Να ε_μφανίζεται η προεπισκόπηση συνομιλίας"
+#~ msgid "To add them as attachments"
+#~ msgstr "Για να τα προσθέσετε ως συνημμένα"
 
-#: ../ui/preferences.glade.h:7
-msgid "Enable _spell checking"
-msgstr "Ενεργοποίηση _ορθογράφου"
+#~ msgid "Find:"
+#~ msgstr "Εύρεση:"
 
-#: ../ui/preferences.glade.h:8
-msgid "Notifications"
-msgstr "Ειδοποιήσεις"
+#~ msgid "_Previous"
+#~ msgstr "_Προηγούμενο"
 
-#: ../ui/preferences.glade.h:9
-msgid "_Play notification sounds"
-msgstr "Α_ναπαραγωγή ήχων ειδοποίησης"
+#~ msgid "_Next"
+#~ msgstr "_Επόμενο"
 
-#: ../ui/preferences.glade.h:10
-msgid "Show _notifications for new mail"
-msgstr "Εμφάνιση ειδοποιήσεων για _νέα μηνύματα"
+#~ msgid "_Case sensitive"
+#~ msgstr "_Διάκριση πεζών/κεφαλαίων"
 
-#: ../ui/preferences.glade.h:11
-msgid "Notify of new mail at start_up"
-msgstr "Ειδοποίηση για νέα αλληλογραφία κατά την εκκί_νηση"
+#~ msgid "label"
+#~ msgstr "ετικέτα"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Είσαστε βέβαιος ότι θέλετε να "
-"αφαιρέσετε αυτόν τον λογαριασμό;</span> "
+#~ msgid "Password"
+#~ msgstr "Κωδικός πρόσβασης"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Όλη η αλληλογραφία που συσχετίζεται με αυτόν τον λογαριασμό θα αφαιρεθεί από "
-"τον υπολογιστή σας. Αυτό δεν θα επηρεάσει την αλληλογραφία στον διακομιστή."
+#~ msgid "E_mail address"
+#~ msgstr "Διεύθυνση ηλεκτρονικού _ταχυδρομίου"
+
+#~ msgid "_Password"
+#~ msgstr "_Κωδικός πρόσβασης"
+
+#~ msgid "S_ervice"
+#~ msgstr "_Υπηρεσία"
+
+#~ msgid "N_ame"
+#~ msgstr "Όν_ομα"
+
+#~ msgid "N_ickname"
+#~ msgstr "_Ψευδώνυμο"
+
+#~ msgid "Work, Home, etc."
+#~ msgstr "Δουλειά, Σπίτι, κ.λπ."
+
+#~ msgid "_Save sent mail"
+#~ msgstr "Απο_θήκευση απεσταλμένων μηνυμάτων"
+
+#~ msgid "IMAP settings"
+#~ msgstr "Ρυθμίσεις IMAP"
+
+#~ msgid "Se_rver"
+#~ msgstr "Δ_ιακομιστής"
+
+#~ msgid "P_ort"
+#~ msgstr "_Θύρα"
+
+#~ msgid "Ser_ver"
+#~ msgstr "Δ_ιακομιστής"
+
+#~ msgid "Por_t"
+#~ msgstr "Θύ_ρα"
+
+#~ msgid "SMTP settings"
+#~ msgstr "Ρυθμίσεις SMTP"
+
+#~ msgid "User_name"
+#~ msgstr "Όνομα_χρήστη"
+
+#~ msgid "Pass_word"
+#~ msgstr "Κ_ωδικός πρόσβασης"
+
+#~ msgid "SMTP username"
+#~ msgstr "Όνομα χρήστη SMTP"
+
+#~ msgid "SMTP password"
+#~ msgstr "Κωδικός πρόσβασης SMTP"
+
+#~ msgid "_Username"
+#~ msgstr "Ό_νομα χρήστη"
+
+#~ msgid "IMAP username"
+#~ msgstr "Όνομα χρήστη IMAP"
+
+#~ msgid "IMAP password"
+#~ msgstr "Κωδικός πρόσβασης IMAP"
+
+#~ msgid "Encr_yption"
+#~ msgstr "Κρυπ_τογράφηση"
+
+#~ msgid "Encrypt_ion"
+#~ msgstr "Κρυπτογράφ_ηση"
+
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
+
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
+
+#~ msgid "No authentication re_quired"
+#~ msgstr "Δεν απαιτείται π_ιστοποίηση"
+
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Χρήση _διαπιστευτηρίων IMAP"
+
+#~ msgid "Storage"
+#~ msgstr "Αποθήκευση"
+
+#~ msgid "_Download mail"
+#~ msgstr "_Λήψη αλληλογραφίας"
+
+#~ msgid "Composer"
+#~ msgstr "Συνθέτης"
+
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Αποθήκευση πρόχειρων στον διακομιστή"
+
+#~ msgid "Si_gn emails:"
+#~ msgstr "Υπο_γραφή μηνυμάτων αλληλογραφίας:"
+
+#~ msgid "SMTP Credentials"
+#~ msgstr "Διαπιστευτήρια SMTP"
+
+#~ msgid "Username"
+#~ msgstr "Όνομα χρήστη"
+
+#~ msgid "_Remember password"
+#~ msgstr "Α_πομνημόνευση κωδικού πρόσβασης"
+
+#~ msgid "_Authenticate"
+#~ msgstr "_Πιστοποίηση"
+
+#~ msgid "Preferences"
+#~ msgstr "Προτιμήσεις"
+
+#~ msgid "Reading"
+#~ msgstr "Aνάγνωση"
+
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Αυτόματη επιλογή επόμενου μηνύματας"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "Να ε_μφανίζεται η προεπισκόπηση συνομιλίας"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Ενεργοποίηση _ορθογράφου"
+
+#~ msgid "Notifications"
+#~ msgstr "Ειδοποιήσεις"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "Α_ναπαραγωγή ήχων ειδοποίησης"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Εμφάνιση ειδοποιήσεων για _νέα μηνύματα"
+
+#~ msgid "Notify of new mail at start_up"
+#~ msgstr "Ειδοποίηση για νέα αλληλογραφία κατά την εκκί_νηση"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Είσαστε βέβαιος ότι θέλετε να "
+#~ "αφαιρέσετε αυτόν τον λογαριασμό;</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Όλη η αλληλογραφία που συσχετίζεται με αυτόν τον λογαριασμό θα αφαιρεθεί από "
+#~ "τον υπολογιστή σας. Αυτό δεν θα επηρεάσει την αλληλογραφία στον διακομιστή."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Ψευδώνυμο:"
+#~ msgid "Nickname:"
+#~ msgstr "Ψευδώνυμο:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Διεύθυνση ηλεκτρονικού ταχυδρομείου:"
+#~ msgid "Email address:"
+#~ msgstr "Διεύθυνση ηλεκτρονικού ταχυδρομείου:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary upgrade in progress."
-msgstr "Η αναβάθμιση του Geary είναι σε εξέλιξη."
+#~ msgid "Geary upgrade in progress."
+#~ msgstr "Η αναβάθμιση του Geary είναι σε εξέλιξη."
 
 #~ msgid "attach|enclosed|enclosing|cover letter"
 #~ msgstr "επισύναψη|περιεχόμενο|περικλείω|γράμμα εξώφυλλου"
 
 #~ msgid "Please enter your password"
 #~ msgstr ""
-#~ "Παρακαλούμε πληκτρολογήστε τον κωδικό πρόσβασης ηλεκτρονικού ταχυδρομείου "
-#~ "σας"
+#~ "Παρακαλούμε πληκτρολογήστε τον κωδικό πρόσβασης ηλεκτρονικού ταχυδρομείου σας"
 
 #~ msgid "Username:"
 #~ msgstr "Όνομα χρήστη:"
diff --git a/po/en_CA.po b/po/en_CA.po
index 34ed77b..ed80873 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -9,1501 +9,1536 @@ 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-20 19:28+0000\n"
-"Last-Translator: yorbajim <jim yorba org>\n"
-"Language-Team: English (Canada) (http://www.transifex.com/projects/p/geary/";
-"language/en_CA/)\n"
-"Language: en_CA\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:00+0000\n"
+"Last-Translator: Jim Nelson <jim yorba org>\n"
+"Language-Team: English (Canada) "
+"(http://www.transifex.com/projects/p/geary/language/en_CA/)\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"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:56+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: en_CA\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:641
-msgid "        &#8226; Connection error.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:624
-msgid "        &#8226; Email address already added to Geary.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:628
-msgid "        &#8226; IMAP connection error.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:631
-msgid "        &#8226; IMAP username or password incorrect.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:621
-msgid "        &#8226; Invalid account nickname.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:634
-msgid "        &#8226; SMTP connection error.\n"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Inbox"
 
-#: ../../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Drafts"
 
-#: ../../src/client/accounts/add-edit-page.vala:645
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Sent Mail"
 
-#: ../../src/client/views/conversation-viewer.vala:1203
-msgid " (Invalid?)"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Starred"
 
-#: ../../src/client/composer/composer-window.vala:972
-#, c-format
-msgid "\"%s\" already attached for delivery."
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:937
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "All Mail"
 
-#: ../../src/client/composer/composer-window.vala:965
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Spam"
 
-#: ../../src/client/composer/composer-window.vala:944
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Rubbish Bin"
 
-#: ../../src/client/composer/composer-window.vala:951
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Outbox"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
 msgstr ""
 
-#. / 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 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 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"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "None"
 
-#. / 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"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr ""
 
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] ""
-msgstr[1] ""
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../../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"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:43
-#, c-format
-msgid "%d results"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
 msgstr ""
 
-#. / 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] ""
-msgstr[1] ""
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Other"
 
-#: ../../src/client/util/util-date.vala:170
-#, c-format
-msgid "%dh ago"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
 msgstr ""
 
-#: ../../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
 msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:222
-#, c-format
-msgid "%i matches"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
 msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:224
-#, c-format
-msgid "%i matches (wrapped)"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
 msgstr ""
 
-#. / 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 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"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:107
-#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
-msgstr[1] ""
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr ""
 
-#. / 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)"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
 msgstr ""
 
-#: ../../src/client/views/conversation-web-view.vala:289
-#, c-format
-msgid "%s - Conversation Inspector"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
 msgstr ""
 
-#: ../../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(no subject)"
+
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %-e %b, %Y at %-l:%M %p"
+
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
 msgstr ""
 
 #. / 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
+#: ../src/engine/rfc822/rfc822-utils.vala:228
 msgid "%s wrote:"
 msgstr "%s wrote:"
 
-#: ../../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] ""
-msgstr[1] ""
-
-#. / 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"
+#. / 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:234
+msgid "On %s:"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:246
-#, c-format
-msgid "%u conversations selected."
-msgstr "%u conversations selected."
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Forwarded message ----------"
 
-#: ../../src/client/views/conversation-viewer.vala:743
-#, c-format
-msgid "%u read messages"
-msgstr ""
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "From: %s\n"
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr ""
 
-#: ../../src/client/util/util-email.vala:30
-msgid "(no subject)"
-msgstr "(no subject)"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Date: %s\n"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Forwarded message ----------"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "To: %s\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:211
-msgid "1 month back"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:214
-msgid "1 year back"
-msgstr ""
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "none"
 
-#: ../../src/client/accounts/add-edit-page.vala:210
-msgid "2 weeks back"
-msgstr ""
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Mail Client"
 
-#: ../../src/client/accounts/add-edit-page.vala:212
-msgid "3 months back"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:213
-msgid "6 months back"
-msgstr ""
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Visit the Yorba web site"
 
-#: ../../ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
 msgstr ""
 
-#: ../../ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#: ../src/client/application/geary-controller.vala:62
+msgid "Delete conversation (Shift+Delete)"
 msgstr ""
 
-#: ../../ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/application/geary-controller.vala:63
+msgid "Delete conversations (Shift+Delete)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1491
-#, 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/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:245
-msgid "A_ccounts"
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1227
-#, c-format
-msgid "About %s"
-msgstr "About %s"
+#: ../src/client/application/geary-controller.vala:72
+msgid "_Archive"
+msgstr "_Archive"
 
-#: ../../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
+#: ../src/client/application/geary-controller.vala:73
+msgid "Archive conversation (A)"
 msgstr ""
 
-#: ../../ui/account_list.glade:71
-msgid "Add account"
+#: ../src/client/application/geary-controller.vala:74
+msgid "Archive conversations (A)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:304
-msgid "Add label"
+#: ../src/client/application/geary-controller.vala:77
+msgid "Mark as S_pam"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:57
-msgid "Add label to conversation"
+#: ../src/client/application/geary-controller.vala:78
+msgid "Mark as not S_pam"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:58
-msgid "Add label to conversations"
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
+msgid "Mark conversation"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "All Mail"
-
-#: ../../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."
+#: ../src/client/application/geary-controller.vala:81
+msgid "Mark conversations"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:24
-msgid "Allow inspection of WebView"
+#: ../src/client/application/geary-controller.vala:82
+msgid "Add label to conversation"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:509
-msgid "Always Show From Sender"
+#: ../src/client/application/geary-controller.vala:83
+msgid "Add label to conversations"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
+msgid "Move conversation"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:48
-msgid "Archive conversation (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:85
+msgid "Move conversations"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:49
-msgid "Archive conversations (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:372
+msgid "A_ccounts"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1477
-#, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr "Are you sure you want to open '%s'?"
+#: ../src/client/application/geary-controller.vala:377
+#: ../src/client/components/stock.vala:27
+msgid "_Preferences"
+msgstr "_Preferences"
 
-#: ../../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."
+#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/components/stock.vala:25
+msgid "_Help"
+msgstr "_Help"
 
-#: ../../src/client/views/conversation-viewer.vala:614
-msgid "Bcc:"
-msgstr "Bcc:"
+#: ../src/client/application/geary-controller.vala:385
+#: ../src/client/components/stock.vala:21
+msgid "_About"
+msgstr "_About"
+
+#: ../src/client/application/geary-controller.vala:389
+#: ../src/client/components/stock.vala:29
+msgid "_Quit"
+msgstr "_Quit"
+
+#: ../src/client/application/geary-controller.vala:394
+msgid "_Mark as..."
+msgstr "_Mark as..."
 
-#: ../../ui/composer.glade:113
-msgid "Bold (Ctrl+B)"
+#: ../src/client/application/geary-controller.vala:400
+msgid "Mark as _Read"
 msgstr ""
 
-#: ../../ui/composer.glade:69
-msgid "C_olor"
-msgstr "C_olour"
+#: ../src/client/application/geary-controller.vala:406
+msgid "Mark as _Unread"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:926
-msgid "Cannot add attachment"
-msgstr "Cannot add attachment"
+#: ../src/client/application/geary-controller.vala:412
+msgid "_Star"
+msgstr "_Star"
 
-#: ../../src/client/views/conversation-viewer.vala:611
-msgid "Cc:"
-msgstr "Cc:"
+#: ../src/client/application/geary-controller.vala:417
+msgid "U_nstar"
+msgstr "U_nstar"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
+#: ../src/client/application/geary-controller.vala:427
+msgid "Add label"
 msgstr ""
 
-#: ../../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Choose a file"
-
-#: ../../src/client/geary-controller.vala:553
-msgid "Co_ntinue"
-msgstr "Co_ntinue"
+#: ../src/client/application/geary-controller.vala:428
+msgid "_Label"
+msgstr "_Label"
 
-#: ../../src/client/geary-application.vala:29
-msgid "Compose Message"
-msgstr "Compose Message"
+#: ../src/client/application/geary-controller.vala:432
+msgid "_Move"
+msgstr "_Move"
 
-#: ../../src/client/geary-controller.vala:313
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr ""
 
-#: ../../ui/preferences.glade:117
-msgid "Composer"
-msgstr "Composer"
-
-#: ../../src/client/views/conversation-viewer.vala:897
-msgid "Copy _Email Address"
-msgstr "Copy _E-mail Address"
-
-#: ../../src/client/views/conversation-viewer.vala:902
-msgid "Copy _Link"
-msgstr "Copy _Link"
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
+msgid "_Reply"
+msgstr "_Reply"
 
-#: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
+#: ../src/client/application/geary-controller.vala:441
+msgid "Reply (Ctrl+R, R)"
 msgstr ""
 
-#: ../../ui/composer.glade:21
-msgid "Cu_t"
+#: ../src/client/application/geary-controller.vala:445
+msgid "R_eply All"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:620
-msgid "Date:"
-msgstr "Date:"
+#: ../src/client/application/geary-controller.vala:446
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+msgstr ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "Date: %s\n"
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
+msgid "_Forward"
+msgstr "_Forward"
 
-#: ../../src/client/geary-controller.vala:43
-msgid "Delete conversation (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:452
+msgid "Forward (Ctrl+L, F)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:44
-msgid "Delete conversations (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:25
-msgid "Display program version"
-msgstr "Display program version"
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
 
-#: ../../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?"
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:666
-msgid "Do you want to discard this message?"
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1479
-msgid "Don't _ask me again"
-msgstr "Don't _ask me again"
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Drafts"
+#: ../src/client/application/geary-controller.vala:746
+msgid "Unable to store server trust exception"
+msgstr ""
 
-#: ../../ui/composer.glade:419
-msgid "Drop files here"
-msgstr "Drop files here"
+#: ../src/client/application/geary-controller.vala:983
+msgid "Your settings are insecure"
+msgstr "Your settings are insecure"
 
-#: ../../ui/login.glade:115
-msgid "E_mail address:"
+#: ../src/client/application/geary-controller.vala:984
+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?"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "E_xit"
+#: ../src/client/application/geary-controller.vala:985
+msgid "Co_ntinue"
+msgstr "Co_ntinue"
+
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/components/status-bar.vala:29
+msgid "Error sending email"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:533
-msgid "Edit Draft"
+#: ../src/client/application/geary-controller.vala:1064
+msgid ""
+"Geary encountered an error sending an email.  If the problem persists, "
+"please manually delete the email from your Outbox folder."
 msgstr ""
 
-#: ../../ui/account_list.glade:84
-msgid "Edit account"
+#: ../src/client/application/geary-controller.vala:1068
+#: ../src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
 msgstr ""
 
-#: ../../ui/remove_confirm.glade:94
-msgid "Email address:"
+#: ../src/client/application/geary-controller.vala:1069
+msgid ""
+"Geary encountered an error saving a sent message to Sent Mail.  The message "
+"will stay in your Outbox folder until you delete it."
 msgstr ""
 
-#: ../../src/client/geary-application.vala:28
-msgid "Email;E-mail;Mail;"
+#: ../src/client/application/geary-controller.vala:1138
+msgid "Labels"
+msgstr "Labels"
+
+#: ../src/client/application/geary-controller.vala:1150
+msgid "Unable to open the database for %s"
 msgstr ""
 
-#: ../../ui/preferences.glade:131
-msgid "Enable _spell checking"
-msgstr "Enable _spell checking"
+#: ../src/client/application/geary-controller.vala:1151
+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 ""
 
-#: ../../ui/login.glade:588
-msgid "Encr_yption:"
-msgstr "Encr_yption:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "_Rebuild"
+msgstr ""
 
-#: ../../ui/login.glade:607
-msgid "Encrypt_ion:"
-msgstr "Encrypt_ion:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "E_xit"
+msgstr ""
 
-#: ../../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:1162
+msgid "Unable to rebuild database for \"%s\""
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:714
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:43
-msgid "Error saving"
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
+msgid "Unable to open local mailbox for %s"
 msgstr ""
 
-#. / 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"
+#: ../src/client/application/geary-controller.vala:1186
+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 ""
 
-#: ../../src/client/accounts/add-edit-page.vala:216
-msgid "Everything"
+#: ../src/client/application/geary-controller.vala:1196
+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 ""
 
-#: ../../src/client/views/conversation-viewer.vala:1897
-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"
-
-#. / 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"
+#: ../src/client/application/geary-controller.vala:1207
+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 ""
 
-#: ../../ui/composer.glade:182
-msgid "Fixed Width"
+#: ../src/client/application/geary-controller.vala:1715
+msgid "About %s"
+msgstr "About %s"
+
+#. / Translators: add your name and email address to receive credit in the About dialog
+#. / For example: Yamada Taro <yamada taro example com>
+#: ../src/client/application/geary-controller.vala:1718
+msgid "translator-credits"
 msgstr ""
+"translator-credits\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Jim Nelson https://launchpad.net/~yorba-jim";
 
-#: ../../src/client/geary-controller.vala:329
-msgid "Forward (Ctrl+L, F)"
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:605
-msgid "From:"
-msgstr "From:"
+#: ../src/client/application/geary-controller.vala:1986
+msgid "Are you sure you want to open \"%s\"?"
+msgstr "Are you sure you want to open '%s'?"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "From: %s\n"
+#: ../src/client/application/geary-controller.vala:1987
+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/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#: ../src/client/application/geary-controller.vala:1988
+msgid "Don't _ask me again"
+msgstr "Don't _ask me again"
 
-#: ../../src/client/geary-application.vala:25
-msgid "Geary Mail"
-msgstr "Geary Mail"
+#: ../src/client/application/geary-controller.vala:2006
+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:626
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+"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."
 
-#: ../../ui/password-dialog.glade:315
-msgid "General"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:2011
+msgid "_Replace"
+msgstr "_Replace"
 
-#: ../../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/client/application/geary-controller.vala:2309
+msgid "Close open draft messages?"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:133
-msgid "IMAP Credentials"
-msgstr "IMAP Credentials"
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
 
-#: ../../ui/login.glade:572
-msgid "IMAP password"
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
 msgstr ""
 
-#: ../../ui/login.glade:286 ../../ui/password-dialog.glade:334
-msgid "IMAP settings"
-msgstr "IMAP settings"
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
+msgstr ""
 
-#: ../../ui/login.glade:556
-msgid "IMAP username"
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Inbox"
+#: ../src/client/application/geary-controller.vala:2489
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
+#: ../src/client/application/geary-controller.vala:2491
+msgid "Delete"
 msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:163
-#, c-format
-msgid "Indexing %s account"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
 msgstr ""
 
-#: ../../ui/composer.glade:120
-msgid "Italic (Ctrl+I)"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
 msgstr ""
 
-#: ../../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
-
-#: ../../src/client/geary-controller.vala:689
-msgid "Labels"
-msgstr "Labels"
-
-#: ../../ui/composer.glade:151
-msgid "Lar_ge"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
 msgstr ""
 
-#: ../../ui/composer.glade:152
-msgid "Large"
-msgstr "Large"
-
-#: ../../ui/composer.glade:62
-msgid "Link (Ctrl+L)"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
 msgstr ""
 
-#. / 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"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Output debugging information"
 
-#: ../../src/client/geary-args.vala:11
+#: ../src/client/application/geary-args.vala:12
 msgid "Log conversation monitoring"
 msgstr "Log conversation monitoring"
 
-#: ../../src/client/geary-args.vala:21
-msgid "Log database queries (generates lots of messages)"
-msgstr "Log database queries (generates lots of messages)"
-
-#. / "Normalization" can also be called "synchronization"
-#: ../../src/client/geary-args.vala:23
-msgid "Log folder normalization"
-msgstr "Log folder normalisation"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:13
+#: ../src/client/application/geary-args.vala:14
 msgid "Log network activity"
 msgstr "Log network activity"
 
-#: ../../src/client/geary-args.vala:12
-msgid "Log network deserialization"
-msgstr ""
+#. / The IMAP replay queue is how changes on the server are replicated on the client.
+#. / It could also be called the IMAP events queue.
+#: ../src/client/application/geary-args.vala:17
+msgid "Log IMAP replay queue"
+msgstr "Log IMAP replay queue"
 
 #. / Serialization is how commands and responses are converted into a stream of bytes for
 #. / network transmission
-#: ../../src/client/geary-args.vala:19
+#: ../src/client/application/geary-args.vala:20
 msgid "Log network serialization"
 msgstr "Log network serialisation"
 
-#: ../../src/client/geary-args.vala:20
+#: ../src/client/application/geary-args.vala:21
 msgid "Log periodic activity"
 msgstr "Log periodic activity"
 
-#: ../../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#: ../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/geary-application.vala:26
-msgid "Mail Client"
-msgstr "Mail Client"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Log folder normalisation"
 
-#: ../../src/client/views/conversation-viewer.vala:1479
-msgid "Mark Unread From _Here"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:52
-msgid "Mark as S_pam"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:277
-msgid "Mark as _Read"
-msgstr ""
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Display program version"
 
-#: ../../src/client/geary-controller.vala:283
-msgid "Mark as _Unread"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:53
-msgid "Mark as not S_pam"
-msgstr ""
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Please report comments, suggestions and bugs to:"
 
-#: ../../src/client/geary-controller.vala:55
-#: ../../src/client/geary-controller.vala:269
-msgid "Mark conversation"
-msgstr ""
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Failed to parse command line options: %s\n"
 
-#: ../../src/client/geary-controller.vala:56
-msgid "Mark conversations"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Unrecognised command line option '%s'\n"
+
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
 msgstr ""
 
-#: ../../src/client/views/formatted-conversation-data.vala:11
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d new message"
+msgstr[1] "%d new messages"
+
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Open"
+
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Me"
 
-#: ../../ui/composer.glade:158
-msgid "Medium"
-msgstr "Medium"
-
-#: ../../ui/composer.glade:75
-msgid "More options"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:59
-#: ../../src/client/geary-controller.vala:308
-msgid "Move conversation"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:60
-msgid "Move conversations"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
 
-#: ../../ui/login.glade:176
-msgid "N_ame:"
-msgstr "N_ame:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
 
-#: ../../ui/login.glade:230
-msgid "N_ickname:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "New Message"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:80
-msgid "Nickname:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
 msgstr ""
 
-#: ../../ui/login.glade:661
-msgid "No authentication re_quired"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:275
-msgid "No conversations in folder."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:244
-msgid "No conversations selected."
-msgstr "No conversations selected."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:273
-msgid "No search results found."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:128
-#: ../../src/engine/api/geary-special-folder-type.vala:58
-msgid "None"
-msgstr "None"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr ""
 
-#: ../../ui/preferences.glade:158
-msgid "Notifications"
-msgstr "Notifications"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr ""
 
-#: ../../src/client/util/util-date.vala:164
-msgid "Now"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
 msgstr ""
 
-#. / 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:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
 msgstr ""
 
-#. / 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:"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
 msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Open"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Choose a file"
 
-#: ../../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Other"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Attach"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Outbox"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:10
-msgid "Output debugging information"
-msgstr "Output debugging information"
+#. / 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 ""
 
-#: ../../ui/login.glade:337
-msgid "P_ort:"
-msgstr "P_ort:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Welcome to Geary."
 
-#: ../../ui/login.glade:474
-msgid "Pass_word:"
-msgstr "Pass_word:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Enter your account information to get started."
 
-#: ../../ui/login.glade:101
-msgid "Password"
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:196
-msgid "Password:"
-msgstr "Password:"
-
-#: ../../ui/composer.glade:102
-msgid "Paste _With Formatting"
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your email password"
-msgstr "Please enter your e-mail password"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:47
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Please report comments, suggestions and bugs to:"
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr ""
 
-#: ../../ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
 msgstr ""
 
-#: ../../ui/login.glade:421
-msgid "Por_t:"
-msgstr "Por_t:"
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:367 ../../ui/password-dialog.glade:470
-msgid "Port:"
-msgstr "Port:"
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr ""
 
-#: ../../ui/composer.glade:81
-msgid "Quote text  (Ctrl+])"
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:322
-msgid "R_eply All"
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
 msgstr ""
 
-#: ../../ui/preferences.glade:55
-msgid "Reading"
-msgstr "Reading"
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:274
-msgid "Real name:"
-msgstr "Real name:"
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:590
+#: ../src/client/accounts/add-edit-page.vala:730
 msgid "Remem_ber password"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:583
-msgid "Remem_ber passwords"
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
 msgstr ""
 
-#: ../../ui/account_list.glade:97
-msgid "Remove account"
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
 msgstr ""
 
-#: ../../ui/composer.glade:95
-msgid "Remove formatting (Ctrl+Space)"
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:318
-msgid "Reply (Ctrl+R, R)"
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:323
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1452
-msgid "Reply to _All"
-msgstr "Reply to _All"
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:163
-msgid "SMTP Credentials"
-msgstr "SMTP Credentials"
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr ""
 
-#: ../../ui/login.glade:507
-msgid "SMTP password"
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
 msgstr ""
 
-#: ../../ui/login.glade:439 ../../ui/password-dialog.glade:437
-msgid "SMTP settings"
-msgstr "SMTP settings"
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr ""
 
-#: ../../ui/login.glade:491
-msgid "SMTP username"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:124
-msgid "SSL"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:382 ../../ui/password-dialog.glade:485
-msgid "SSL/TLS encryption:"
-msgstr "SSL/TLS encryption:"
+#. / 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"
 
-#: ../../src/client/dialogs/password-dialog.vala:126
-msgid "STARTTLS"
-msgstr ""
+#. / 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 "%l:%M %P"
+
+#. / 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 %-l:%M %P"
 
-#: ../../ui/composer.glade:169
-msgid "S_ans Serif"
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
 msgstr ""
 
-#: ../../ui/composer.glade:175
-msgid "S_erif"
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
 msgstr ""
 
-#: ../../ui/login.glade:160
-msgid "S_ervice:"
+#. / 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
+msgid "%A"
 msgstr ""
 
-#: ../../ui/composer.glade:170
-msgid "Sans Serif"
-msgstr "Sans Serif"
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "bytes"
 
-#: ../../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..."
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "TB"
 
-#: ../../src/client/views/conversation-viewer.vala:1400
-msgid "Save All A_ttachments..."
-msgstr "Save All A_ttachments..."
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "GB"
 
-#: ../../src/client/composer/composer-window.vala:41
-msgid "Saved"
-msgstr ""
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "MB"
 
-#: ../../src/client/composer/composer-window.vala:42
-msgid "Saving"
-msgstr ""
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "KB"
 
-#: ../../ui/login.glade:304
-msgid "Se_rver:"
-msgstr "Se_rver:"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../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 ""
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:39
-#: ../../src/client/ui/main-toolbar.vala:170
-#, c-format
-msgid "Search %s account"
+#. / 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
+msgid "%s, %s"
 msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:76
-msgid "Search all mail in account for keywords (Ctrl+S)"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:1243
-msgid "Select Color"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:32
-#: ../../src/client/views/conversation-viewer.vala:916
-msgid "Select _All"
-msgstr "Select _All"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/views/conversation-viewer.vala:910
-msgid "Select _Message"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "No conversations selected."
 
-#: ../../src/client/geary-application.vala:27
-msgid "Send and receive email"
-msgstr "Send and receive e-mail"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/composer/composer-window.vala:747
-msgid "Send message with an empty body?"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:743
-msgid "Send message with an empty subject and body?"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:745
-msgid "Send message with an empty subject?"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:749
-msgid "Send message without an attachment?"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
 msgstr ""
 
-#. / 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..."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Sent Mail"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
+msgstr ""
 
-#: ../../ui/login.glade:404
-msgid "Ser_ver:"
-msgstr "Ser_ver:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "From:"
 
-#: ../../ui/composer.glade:176
-msgid "Serif"
-msgstr "Serif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "To:"
 
-#: ../../ui/password-dialog.glade:352 ../../ui/password-dialog.glade:455
-msgid "Server:"
-msgstr "Server:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Cc:"
 
-#: ../../ui/password-dialog.glade:259
-msgid "Service:"
-msgstr "Service:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Bcc:"
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "Show Images"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "Subject:"
 
-#: ../../ui/preferences.glade:193
-msgid "Show _notifications for new mail"
-msgstr "Show _notifications for new mail"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Date:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:164
-msgid "Small"
-msgstr "Small"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Spam"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "_Copy"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Starred"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "Copy _E-mail Address"
 
-#: ../../ui/login.glade:761
-msgid "Storage"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "Copy _Link"
 
-#: ../../ui/composer.glade:134
-msgid "Strikethrough (Ctrl+K)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:617
-msgid "Subject:"
-msgstr "Subject:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Select _All"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
 msgstr ""
 
-#: ../../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:1493
-#, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
 msgstr ""
-"The file already exists in '%s'.  Replacing it will overwrite its contents."
 
-#: ../../src/client/geary-controller.vala:747
-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."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
 msgstr ""
 
-#: ../../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."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
 msgstr ""
 
-#: ../../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"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_Save As..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "Save All A_ttachments..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] "Save A_ttachment..."
+msgstr[1] "Save All A_ttachments..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "Reply to _All"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "_Mark as Read"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "_Mark as Unread"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
 msgstr ""
 
-#: ../../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>"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "_View Source"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "Failed to open default text editor."
+
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1147
-msgid "This link appears to go to"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "This message contains remote images."
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
 msgstr ""
 
-#: ../../ui/composer.glade:435
-msgid "To add them as attachments"
-msgstr "To add them as attachments"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:608
-msgid "To:"
-msgstr "To:"
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "To: %s\n"
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "New Message"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Rubbish Bin"
+#: ../src/client/composer/composer-widget.vala:138
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:294
-msgid "U_nstar"
-msgstr "U_nstar"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:17
-msgid "Unable to login to email server"
-msgstr "Unable to log-in to e-mail server"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr ""
 
-#: ../../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"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:701
-#, c-format
-msgid "Unable to open the database for %s"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:713
-#, c-format
-msgid "Unable to rebuild database for \"%s\""
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:619
-msgid "Unable to validate:\n"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Cannot add attachment"
+
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
 msgstr ""
 
-#: ../../ui/composer.glade:127
-msgid "Underline (Ctrl+U)"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
 msgstr ""
 
-#: ../../ui/composer.glade:88
-msgid "Unquote text (Ctrl+[)"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
 msgstr ""
 
-#: ../../src/client/geary-args.vala:65
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Unrecognised command line option '%s'\n"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr ""
 
-#: ../../ui/login.glade:457
-msgid "User_name:"
-msgstr "User_name:"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr ""
 
-#: ../../ui/password-dialog.glade:70 ../../ui/password-dialog.glade:181
-msgid "Username:"
-msgstr "Username:"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr ""
 
-#: ../../src/client/geary-application.vala:19
-msgid "Visit the Yorba web site"
-msgstr "Visit the Yorba web site"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-#, c-format
-msgid "Welcome to Geary."
-msgstr "Welcome to Geary."
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr ""
 
-#: ../../ui/login.glade:252
-msgid "Work, Home, etc."
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
 msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr ""
 
-#: ../../src/client/util/util-date.vala:177
-msgid "Yesterday"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
 msgstr ""
 
-#: ../../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?"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
 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?"
 
-#: ../../src/client/geary-controller.vala:551
-msgid "Your settings are insecure"
-msgstr "Your settings are insecure"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:258
-#: ../../src/client/ui/stock.vala:21
-msgid "_About"
-msgstr "_About"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr ""
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:22
-msgid "_Add"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:47
-msgid "_Archive"
-msgstr "_Archive"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Attach"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:525
-msgid "_Attach File"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
 msgstr ""
 
-#: ../../ui/preferences.glade:69
-msgid "_Automatically select next message"
-msgstr "_Automatically select next message"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr ""
 
-#: ../../src/client/ui/stock.vala:19
+#: ../src/client/components/stock.vala:19
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../../ui/composer.glade:52
-msgid "_Center"
-msgstr "_Centre"
-
-#: ../../src/client/ui/stock.vala:23
+#: ../src/client/components/stock.vala:23
 msgid "_Close"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:889
-msgid "_Copy"
-msgstr "_Copy"
-
-#: ../../src/client/geary-controller.vala:42
-msgid "_Delete"
-msgstr "_Delete"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:548
-msgid "_Details"
-msgstr "_Details"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr ""
 
-#: ../../src/client/ui/stock.vala:24
-msgid "_Discard"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
 msgstr ""
 
-#: ../../ui/preferences.glade:90
-msgid "_Display conversation preview"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:262
-msgid "_Donate"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
 msgstr ""
 
-#: ../../ui/login.glade:782
-msgid "_Download mail:"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
 msgstr ""
 
-#: ../../ui/composer.glade:181
-msgid "_Fixed Width"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:328
-#: ../../src/client/views/conversation-viewer.vala:1457
-msgid "_Forward"
-msgstr "_Forward"
+#~ msgid "%u conversations selected."
+#~ msgstr "%u conversations selected."
 
-#: ../../src/client/geary-controller.vala:254
-#: ../../src/client/ui/stock.vala:25
-msgid "_Help"
-msgstr "_Help"
+#~ msgid "C_olor"
+#~ msgstr "C_olour"
 
-#: ../../ui/composer.glade:542
-msgid "_Include Original Attachments"
-msgstr ""
+#~ msgid "Compose Message"
+#~ msgstr "Compose Message"
 
-#: ../../src/client/views/conversation-viewer.vala:922
-msgid "_Inspect"
-msgstr ""
+#~ msgid "Composer"
+#~ msgstr "Composer"
 
-#: ../../ui/composer.glade:57
-msgid "_Justify"
-msgstr "_Justify"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Do you want to discard the unsaved message?"
 
-#: ../../src/client/ui/stock.vala:33
-msgid "_Keep"
-msgstr ""
+#~ msgid "Drop files here"
+#~ msgstr "Drop files here"
 
-#: ../../src/client/geary-controller.vala:305
-msgid "_Label"
-msgstr "_Label"
+#~ msgid "Enable _spell checking"
+#~ msgstr "Enable _spell checking"
 
-#: ../../ui/composer.glade:42
-msgid "_Left"
-msgstr "_Left"
+#~ msgid "Encr_yption:"
+#~ msgstr "Encr_yption:"
 
-#: ../../src/client/views/conversation-viewer.vala:1469
-msgid "_Mark as Read"
-msgstr "_Mark as Read"
+#~ msgid "Encrypt_ion:"
+#~ msgstr "Encrypt_ion:"
 
-#: ../../src/client/views/conversation-viewer.vala:1473
-msgid "_Mark as Unread"
-msgstr "_Mark as Unread"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary Mail"
 
-#: ../../src/client/geary-controller.vala:271
-msgid "_Mark as..."
-msgstr "_Mark as..."
+#~ msgid "IMAP Credentials"
+#~ msgstr "IMAP Credentials"
 
-#: ../../ui/composer.glade:157
-msgid "_Medium"
-msgstr ""
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP settings"
 
-#: ../../src/client/geary-controller.vala:309
-msgid "_Move"
-msgstr "_Move"
+#~ msgid "Large"
+#~ msgstr "Large"
 
-#: ../../src/client/ui/stock.vala:18
-msgid "_OK"
-msgstr ""
+#~ msgid "Medium"
+#~ msgstr "Medium"
 
-#: ../../src/client/ui/stock.vala:26
-msgid "_Open"
-msgstr ""
+#~ msgid "N_ame:"
+#~ msgstr "N_ame:"
 
-#: ../../ui/login.glade:131 ../../ui/login.glade:539
-#: ../../ui/password-dialog.glade:85
-msgid "_Password:"
-msgstr "_Password:"
+#~ msgid "Notifications"
+#~ msgstr "Notifications"
 
-#: ../../ui/composer.glade:35
-msgid "_Paste"
-msgstr ""
+#~ msgid "P_ort:"
+#~ msgstr "P_ort:"
 
-#: ../../ui/preferences.glade:172
-msgid "_Play notification sounds"
-msgstr "_Play notification sounds"
+#~ msgid "Pass_word:"
+#~ msgstr "Pass_word:"
 
-#: ../../src/client/geary-controller.vala:250
-#: ../../src/client/ui/stock.vala:27
-msgid "_Preferences"
-msgstr "_Preferences"
+#~ msgid "Password:"
+#~ msgstr "Password:"
 
-#: ../../src/client/ui/stock.vala:28
-msgid "_Print..."
-msgstr ""
+#~ msgid "Please enter your email password"
+#~ msgstr "Please enter your e-mail password"
 
-#: ../../src/client/geary-controller.vala:266
-#: ../../src/client/ui/stock.vala:29
-msgid "_Quit"
-msgstr "_Quit"
+#~ msgid "Por_t:"
+#~ msgstr "Por_t:"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "_Rebuild"
-msgstr ""
+#~ msgid "Port:"
+#~ msgstr "Port:"
 
-#: ../../ui/composer.glade:14
-msgid "_Redo"
-msgstr ""
+#~ msgid "Reading"
+#~ msgstr "Reading"
 
-#: ../../ui/password-dialog.glade:561
-msgid "_Remember passwords"
-msgstr ""
+#~ msgid "Real name:"
+#~ msgstr "Real name:"
 
-#: ../../src/client/ui/stock.vala:30
-msgid "_Remove"
-msgstr ""
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP Credentials"
 
-#: ../../src/client/geary-controller.vala:1496
-msgid "_Replace"
-msgstr "_Replace"
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP settings"
 
-#: ../../src/client/geary-controller.vala:317
-#: ../../src/client/views/conversation-viewer.vala:1447
-msgid "_Reply"
-msgstr "_Reply"
+#~ msgid "SSL/TLS encryption:"
+#~ msgstr "SSL/TLS encryption:"
 
-#: ../../ui/composer.glade:141
-msgid "_Rich Text"
-msgstr ""
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../../ui/composer.glade:47
-msgid "_Right"
-msgstr "_Right"
+#~ msgid "Se_rver:"
+#~ msgstr "Se_rver:"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:31
-msgid "_Save"
-msgstr ""
+#~ msgid "Send and receive email"
+#~ msgstr "Send and receive e-mail"
 
-#: ../../src/client/views/conversation-viewer.vala:1395
-msgid "_Save As..."
-msgstr "_Save As..."
+#~ msgid "Ser_ver:"
+#~ msgstr "Ser_ver:"
 
-#: ../../src/client/views/conversation-viewer.vala:1414
-msgid "_Save Image As..."
-msgstr ""
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../../ui/composer.glade:594
-msgid "_Send"
-msgstr "_Send"
+#~ msgid "Server:"
+#~ msgstr "Server:"
 
-#: ../../ui/composer.glade:163
-msgid "_Small"
-msgstr ""
+#~ msgid "Service:"
+#~ msgstr "Service:"
 
-#: ../../src/client/geary-controller.vala:289
-msgid "_Star"
-msgstr "_Star"
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Show _notifications for new mail"
 
-#: ../../ui/composer.glade:7
-msgid "_Undo"
-msgstr ""
+#~ msgid "Small"
+#~ msgstr "Small"
 
-#: ../../ui/login.glade:522
-msgid "_Username:"
-msgstr "_Username:"
+#~ msgid "To add them as attachments"
+#~ msgstr "To add them as attachments"
 
-#: ../../src/client/views/conversation-viewer.vala:1494
-msgid "_View Source"
-msgstr "_View Source"
+#~ msgid "Unable to login to email server"
+#~ msgstr "Unable to log-in to e-mail server"
 
-#. / 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 ""
+#~ msgid "User_name:"
+#~ msgstr "User_name:"
 
-#: ../../src/client/views/conversation-viewer.vala:1148
-msgid "but actually goes to"
-msgstr ""
+#~ msgid "Username:"
+#~ msgstr "Username:"
 
-#: ../../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "bytes"
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Automatically select next message"
 
-#. / 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 "_Center"
+#~ msgstr "_Centre"
 
-#: ../../src/client/views/conversation-find-bar.vala:226
-msgid "not found"
-msgstr ""
+#~ msgid "_Delete"
+#~ msgstr "_Delete"
 
-#. / 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 "_Details"
+#~ msgstr "_Details"
+
+#~ msgid "_Justify"
+#~ msgstr "_Justify"
+
+#~ msgid "_Left"
+#~ msgstr "_Left"
+
+#~ msgid "_Password:"
+#~ msgstr "_Password:"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Play notification sounds"
+
+#~ msgid "_Right"
+#~ msgstr "_Right"
+
+#~ msgid "_Send"
+#~ msgstr "_Send"
+
+#~ msgid "_Username:"
+#~ msgstr "_Username:"
diff --git a/po/en_GB.po b/po/en_GB.po
index 32cc694..80d8a14 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -11,523 +11,506 @@ 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"
-"Language: en_GB\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:01+0000\n"
+"Last-Translator: ajshephard <Unknown>\n"
+"Language-Team: English (United Kingdom) "
+"(http://www.transifex.com/projects/p/geary/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"
-
-#: ../../src/client/accounts/add-edit-page.vala:641
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Connection error.\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:56+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: en_GB\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/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:628
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP connection error.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
 
-#: ../../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/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:621
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Invalid account nickname.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:634
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP connection error.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; SMTP username or password incorrect.\n"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Inbox"
 
-#: ../../src/client/accounts/add-edit-page.vala:645
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Username or password incorrect.\n"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Drafts"
 
-#: ../../src/client/views/conversation-viewer.vala:1203
-msgid " (Invalid?)"
-msgstr " (Invalid?)"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Sent Mail"
 
-#: ../../src/client/composer/composer-window.vala:972
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" already attached for delivery."
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Starred"
 
-#: ../../src/client/composer/composer-window.vala:937
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "\"%s\" could not be found."
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Important"
 
-#: ../../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."
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "All Mail"
 
-#: ../../src/client/composer/composer-window.vala:944
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" is a folder."
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Spam"
 
-#: ../../src/client/composer/composer-window.vala:951
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" is an empty file."
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Rubbish Bin"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Outbox"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Search"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Archive"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "None"
 
-#. / 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"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../../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"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../../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"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:43
-#, c-format
-msgid "%d results"
-msgstr "%d results"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Other"
 
-#. / 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"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr ""
 
-#: ../../src/client/util/util-date.vala:170
-#, c-format
-msgid "%dh ago"
-msgstr "%dh ago"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr ""
 
-#: ../../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgstr "%dm ago"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:222
-#, c-format
-msgid "%i matches"
-msgstr "%i matches"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:224
-#, c-format
-msgid "%i matches (wrapped)"
-msgstr "%i matches (wrapped)"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr ""
 
-#. / 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"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr ""
 
-#. / 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"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:107
-#, 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/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr ""
 
-#. / 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)"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(no subject)"
 
-#: ../../src/client/views/conversation-web-view.vala:289
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - Conversation Inspector"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %-e %b, %Y at %-l:%M %p"
 
-#: ../../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - New Messages"
+#. / 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:221
+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:178
-#, c-format
+#: ../src/engine/rfc822/rfc822-utils.vala:228
 msgid "%s wrote:"
 msgstr "%s wrote:"
 
-#: ../../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"
+#. / 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:234
+msgid "On %s:"
+msgstr "On %s:"
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Forwarded message ----------"
 
-#: ../../src/client/views/conversation-viewer.vala:246
-#, c-format
-msgid "%u conversations selected."
-msgstr "%u conversations selected."
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "From: %s\n"
 
-#: ../../src/client/views/conversation-viewer.vala:743
-#, c-format
-msgid "%u read messages"
-msgstr "%u read messages"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Subject: %s\n"
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Date: %s\n"
 
-#: ../../src/client/util/util-email.vala:30
-msgid "(no subject)"
-msgstr "(no subject)"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "To: %s\n"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Forwarded message ----------"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Cc: %s\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:211
-msgid "1 month back"
-msgstr "1 month back"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "none"
 
-#: ../../src/client/accounts/add-edit-page.vala:214
-msgid "1 year back"
-msgstr "1 year back"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Mail Client"
 
-#: ../../src/client/accounts/add-edit-page.vala:210
-msgid "2 weeks back"
-msgstr "2 weeks back"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:212
-msgid "3 months back"
-msgstr "3 months back"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Visit the Yorba web site"
 
-#: ../../src/client/accounts/add-edit-page.vala:213
-msgid "6 months back"
-msgstr "6 months back"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
+#: ../src/client/application/geary-controller.vala:62
+msgid "Delete conversation (Shift+Delete)"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
 
-#: ../../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> "
+#: ../src/client/application/geary-controller.vala:63
+msgid "Delete conversations (Shift+Delete)"
+msgstr ""
 
-#: ../../ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
 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
-#, 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/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:245
-msgid "A_ccounts"
-msgstr "A_ccounts"
+#: ../src/client/application/geary-controller.vala:72
+msgid "_Archive"
+msgstr "_Archive"
 
-#: ../../src/client/geary-controller.vala:1227
-#, c-format
-msgid "About %s"
-msgstr "About %s"
+#: ../src/client/application/geary-controller.vala:73
+msgid "Archive conversation (A)"
+msgstr ""
 
-#: ../../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Accounts"
+#: ../src/client/application/geary-controller.vala:74
+msgid "Archive conversations (A)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:77
+msgid "Mark as S_pam"
+msgstr "Mark as S_pam"
 
-#: ../../ui/account_list.glade:71
-msgid "Add account"
-msgstr "Add account"
+#: ../src/client/application/geary-controller.vala:78
+msgid "Mark as not S_pam"
+msgstr "Mark as not S_pam"
 
-#: ../../src/client/geary-controller.vala:304
-msgid "Add label"
-msgstr "Add label"
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
+msgid "Mark conversation"
+msgstr "Mark conversation"
+
+#: ../src/client/application/geary-controller.vala:81
+msgid "Mark conversations"
+msgstr "Mark conversations"
 
-#: ../../src/client/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Add label to conversation"
 
-#: ../../src/client/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Add label to conversations"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "All Mail"
-
-#: ../../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/geary-args.vala:24
-msgid "Allow inspection of WebView"
-msgstr "Allow inspection of WebView"
-
-#: ../../src/client/views/conversation-viewer.vala:509
-msgid "Always Show From Sender"
-msgstr "Always Show From Sender"
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
+msgid "Move conversation"
+msgstr "Move conversation"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Archive"
+#: ../src/client/application/geary-controller.vala:85
+msgid "Move conversations"
+msgstr "Move conversations"
 
-#: ../../src/client/geary-controller.vala:48
-msgid "Archive conversation (Delete, Backspace, A)"
-msgstr "Archive conversation (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:372
+msgid "A_ccounts"
+msgstr "A_ccounts"
 
-#: ../../src/client/geary-controller.vala:49
-msgid "Archive conversations (Delete, Backspace, A)"
-msgstr "Archive conversations (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:377
+#: ../src/client/components/stock.vala:27
+msgid "_Preferences"
+msgstr "_Preferences"
 
-#: ../../src/client/geary-controller.vala:1477
-#, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr "Are you sure you want to open '%s'?"
+#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/components/stock.vala:25
+msgid "_Help"
+msgstr "_Help"
 
-#: ../../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."
+#: ../src/client/application/geary-controller.vala:385
+#: ../src/client/components/stock.vala:21
+msgid "_About"
+msgstr "_About"
 
-#: ../../src/client/views/conversation-viewer.vala:614
-msgid "Bcc:"
-msgstr "Bcc:"
+#: ../src/client/application/geary-controller.vala:389
+#: ../src/client/components/stock.vala:29
+msgid "_Quit"
+msgstr "_Quit"
 
-#: ../../ui/composer.glade:113
-msgid "Bold (Ctrl+B)"
-msgstr "Bold (Ctrl+B)"
+#: ../src/client/application/geary-controller.vala:394
+msgid "_Mark as..."
+msgstr "_Mark as..."
 
-#: ../../ui/composer.glade:69
-msgid "C_olor"
-msgstr "C_olour"
+#: ../src/client/application/geary-controller.vala:400
+msgid "Mark as _Read"
+msgstr "Mark as _Read"
 
-#: ../../src/client/composer/composer-window.vala:926
-msgid "Cannot add attachment"
-msgstr "Cannot add attachment"
+#: ../src/client/application/geary-controller.vala:406
+msgid "Mark as _Unread"
+msgstr "Mark as _Unread"
 
-#: ../../src/client/views/conversation-viewer.vala:611
-msgid "Cc:"
-msgstr "Cc:"
+#: ../src/client/application/geary-controller.vala:412
+msgid "_Star"
+msgstr "_Star"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Cc: %s\n"
+#: ../src/client/application/geary-controller.vala:417
+msgid "U_nstar"
+msgstr "U_nstar"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Choose a file"
+#: ../src/client/application/geary-controller.vala:427
+msgid "Add label"
+msgstr "Add label"
 
-#: ../../src/client/geary-controller.vala:553
-msgid "Co_ntinue"
-msgstr "Co_ntinue"
+#: ../src/client/application/geary-controller.vala:428
+msgid "_Label"
+msgstr "_Label"
 
-#: ../../src/client/geary-application.vala:29
-msgid "Compose Message"
-msgstr "Compose Message"
+#: ../src/client/application/geary-controller.vala:432
+msgid "_Move"
+msgstr "_Move"
 
-#: ../../src/client/geary-controller.vala:313
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Compose new message (Ctrl+N, N)"
 
-#: ../../ui/preferences.glade:117
-msgid "Composer"
-msgstr "Composer"
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
+msgid "_Reply"
+msgstr "_Reply"
 
-#: ../../src/client/views/conversation-viewer.vala:897
-msgid "Copy _Email Address"
-msgstr "Copy _E-mail Address"
+#: ../src/client/application/geary-controller.vala:441
+msgid "Reply (Ctrl+R, R)"
+msgstr "Reply (Ctrl+R, R)"
 
-#: ../../src/client/views/conversation-viewer.vala:902
-msgid "Copy _Link"
-msgstr "Copy _Link"
+#: ../src/client/application/geary-controller.vala:445
+msgid "R_eply All"
+msgstr "R_eply All"
 
-#: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr "Copyright 2011-2013 Yorba Foundation"
+#: ../src/client/application/geary-controller.vala:446
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+msgstr "Reply all (Ctrl+Shift+R, Shift+R)"
 
-#: ../../ui/composer.glade:21
-msgid "Cu_t"
-msgstr "Cu_t"
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
+msgid "_Forward"
+msgstr "_Forward"
 
-#: ../../src/client/views/conversation-viewer.vala:620
-msgid "Date:"
-msgstr "Date:"
+#: ../src/client/application/geary-controller.vala:452
+msgid "Forward (Ctrl+L, F)"
+msgstr "Forward (Ctrl+L, F)"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "Date: %s\n"
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:43
-msgid "Delete conversation (Delete, Backspace, A)"
-msgstr "Delete conversation (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:44
-msgid "Delete conversations (Delete, Backspace, A)"
-msgstr "Delete conversations (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:25
-msgid "Display program version"
-msgstr "Display program version"
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
 
-#: ../../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?"
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
 
-#: ../../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-controller.vala:746
+msgid "Unable to store server trust exception"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:1479
-msgid "Don't _ask me again"
-msgstr "Don't _ask me again"
+#: ../src/client/application/geary-controller.vala:983
+msgid "Your settings are insecure"
+msgstr "Your settings are insecure"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Drafts"
+#: ../src/client/application/geary-controller.vala:984
+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?"
 
-#: ../../ui/composer.glade:419
-msgid "Drop files here"
-msgstr "Drop files here"
+#: ../src/client/application/geary-controller.vala:985
+msgid "Co_ntinue"
+msgstr "Co_ntinue"
 
-#: ../../ui/login.glade:115
-msgid "E_mail address:"
-msgstr "E_mail address:"
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/components/status-bar.vala:29
+msgid "Error sending email"
+msgstr "Error sending email"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "E_xit"
-msgstr "E_xit"
+#: ../src/client/application/geary-controller.vala:1064
+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/views/conversation-viewer.vala:533
-msgid "Edit Draft"
-msgstr "Edit Draft"
+#: ../src/client/application/geary-controller.vala:1068
+#: ../src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
+msgstr ""
 
-#: ../../ui/account_list.glade:84
-msgid "Edit account"
-msgstr "Edit account"
+#: ../src/client/application/geary-controller.vala:1069
+msgid ""
+"Geary encountered an error saving a sent message to Sent Mail.  The message "
+"will stay in your Outbox folder until you delete it."
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:94
-msgid "Email address:"
-msgstr "Email address:"
+#: ../src/client/application/geary-controller.vala:1138
+msgid "Labels"
+msgstr "Labels"
 
-#: ../../src/client/geary-application.vala:28
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Mail;"
+#: ../src/client/application/geary-controller.vala:1150
+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:1151
+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:1153
+msgid "_Rebuild"
+msgstr "_Rebuild"
 
-#: ../../ui/login.glade:607
-msgid "Encrypt_ion:"
-msgstr "Encrypt_ion:"
+#: ../src/client/application/geary-controller.vala:1153
+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:1162
+msgid "Unable to rebuild database for \"%s\""
+msgstr "Unable to rebuild database for \"%s\""
 
-#: ../../src/client/geary-controller.vala:714
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -537,1015 +520,1262 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../src/client/composer/composer-window.vala:43
-msgid "Error saving"
-msgstr "Error saving"
-
-#. / 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:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
+msgid "Unable to open local mailbox for %s"
+msgstr "Unable to open local mailbox for %s"
 
-#: ../../src/client/accounts/add-edit-page.vala:216
-msgid "Everything"
-msgstr "Everything"
+#: ../src/client/application/geary-controller.vala:1186
+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:1897
-msgid "Failed to open default text editor."
-msgstr "Failed to open default text editor."
+#: ../src/client/application/geary-controller.vala:1196
+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/geary-args.vala:54
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Failed to parse command line options: %s\n"
+#: ../src/client/application/geary-controller.vala:1207
+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."
 
-#. / 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/application/geary-controller.vala:1715
+msgid "About %s"
+msgstr "About %s"
 
-#: ../../ui/composer.glade:182
-msgid "Fixed Width"
-msgstr "Fixed Width"
+#. / 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-controller.vala:1718
+msgid "translator-credits"
+msgstr ""
+"translator-credits\n"
+"\n"
+"Launchpad Contributions:\n"
+"  ajshephard https://launchpad.net/~andrew-james-shephard";
 
-#: ../../src/client/geary-controller.vala:329
-msgid "Forward (Ctrl+L, F)"
-msgstr "Forward (Ctrl+L, F)"
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:605
-msgid "From:"
-msgstr "From:"
+#: ../src/client/application/geary-controller.vala:1986
+msgid "Are you sure you want to open \"%s\"?"
+msgstr "Are you sure you want to open '%s'?"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "From: %s\n"
+#: ../src/client/application/geary-controller.vala:1987
+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/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#: ../src/client/application/geary-controller.vala:1988
+msgid "Don't _ask me again"
+msgstr "Don't _ask me again"
 
-#: ../../src/client/geary-application.vala:25
-msgid "Geary Mail"
-msgstr "Geary Mail"
+#: ../src/client/application/geary-controller.vala:2006
+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:626
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+"The file already exists in '%s'.  Replacing it will overwrite its contents."
 
-#: ../../ui/password-dialog.glade:315
-msgid "General"
-msgstr "General"
+#: ../src/client/application/geary-controller.vala:2011
+msgid "_Replace"
+msgstr "_Replace"
 
-#: ../../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/client/application/geary-controller.vala:2309
+msgid "Close open draft messages?"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:133
-msgid "IMAP Credentials"
-msgstr "IMAP Credentials"
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
 
-#: ../../ui/login.glade:572
-msgid "IMAP password"
-msgstr "IMAP password"
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
 
-#: ../../ui/login.glade:286 ../../ui/password-dialog.glade:334
-msgid "IMAP settings"
-msgstr "IMAP settings"
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
+msgstr ""
 
-#: ../../ui/login.glade:556
-msgid "IMAP username"
-msgstr "IMAP username"
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Important"
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Inbox"
+#: ../src/client/application/geary-controller.vala:2489
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Inboxes"
+#: ../src/client/application/geary-controller.vala:2491
+msgid "Delete"
+msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:163
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indexing %s account"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
+msgstr ""
 
-#: ../../ui/composer.glade:120
-msgid "Italic (Ctrl+I)"
-msgstr "Italic (Ctrl+I)"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:689
-msgid "Labels"
-msgstr "Labels"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr ""
+
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Output debugging information"
 
-#: ../../ui/composer.glade:151
-msgid "Lar_ge"
-msgstr "Lar_ge"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Log conversation monitoring"
 
-#: ../../ui/composer.glade:152
-msgid "Large"
-msgstr "Large"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Log network deserialisation"
 
-#: ../../ui/composer.glade:62
-msgid "Link (Ctrl+L)"
-msgstr "Link (Ctrl+L)"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Log network activity"
 
 #. / The IMAP replay queue is how changes on the server are replicated on the client.
 #. / It could also be called the IMAP events queue.
-#: ../../src/client/geary-args.vala:16
+#: ../src/client/application/geary-args.vala:17
 msgid "Log IMAP replay queue"
 msgstr "Log IMAP replay queue"
 
-#: ../../src/client/geary-args.vala:11
-msgid "Log conversation monitoring"
-msgstr "Log conversation monitoring"
+#. / Serialization is how commands and responses are converted into a stream of bytes for
+#. / network transmission
+#: ../src/client/application/geary-args.vala:20
+msgid "Log network serialization"
+msgstr "Log network serialisation"
+
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Log periodic activity"
 
-#: ../../src/client/geary-args.vala:21
+#: ../src/client/application/geary-args.vala:22
 msgid "Log database queries (generates lots of messages)"
 msgstr "Log database queries (generates lots of messages)"
 
 #. / "Normalization" can also be called "synchronization"
-#: ../../src/client/geary-args.vala:23
+#: ../src/client/application/geary-args.vala:24
 msgid "Log folder normalization"
 msgstr "Log folder normalisation"
 
-#: ../../src/client/geary-args.vala:13
-msgid "Log network activity"
-msgstr "Log network activity"
-
-#: ../../src/client/geary-args.vala:12
-msgid "Log network deserialization"
-msgstr "Log network deserialisation"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Allow inspection of WebView"
 
-#. / 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/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:20
-msgid "Log periodic activity"
-msgstr "Log periodic activity"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Display program version"
 
-#: ../../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr ""
 
-#: ../../src/client/geary-application.vala:26
-msgid "Mail Client"
-msgstr "Mail Client"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Please report comments, suggestions and bugs to:"
 
-#: ../../src/client/views/conversation-viewer.vala:1479
-msgid "Mark Unread From _Here"
-msgstr "Mark Unread From _Here"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Failed to parse command line options: %s\n"
 
-#: ../../src/client/geary-controller.vala:52
-msgid "Mark as S_pam"
-msgstr "Mark as S_pam"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Unrecognised command line option '%s'\n"
 
-#: ../../src/client/geary-controller.vala:277
-msgid "Mark as _Read"
-msgstr "Mark as _Read"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - New Messages"
 
-#: ../../src/client/geary-controller.vala:283
-msgid "Mark as _Unread"
-msgstr "Mark as _Unread"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d new message"
+msgstr[1] "%d new messages"
 
-#: ../../src/client/geary-controller.vala:53
-msgid "Mark as not S_pam"
-msgstr "Mark as not S_pam"
+#: ../src/client/notification/libnotify.vala:75
+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/geary-controller.vala:55
-#: ../../src/client/geary-controller.vala:269
-msgid "Mark conversation"
-msgstr "Mark conversation"
+#: ../src/client/notification/libnotify.vala:107
+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/geary-controller.vala:56
-msgid "Mark conversations"
-msgstr "Mark conversations"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Open"
 
-#: ../../src/client/views/formatted-conversation-data.vala:11
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Me"
 
-#: ../../ui/composer.glade:158
-msgid "Medium"
-msgstr "Medium"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr ""
 
-#: ../../ui/composer.glade:75
-msgid "More options"
-msgstr "More options"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:59
-#: ../../src/client/geary-controller.vala:308
-msgid "Move conversation"
-msgstr "Move conversation"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:60
-msgid "Move conversations"
-msgstr "Move conversations"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
 
-#: ../../ui/login.glade:176
-msgid "N_ame:"
-msgstr "N_ame:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr ""
 
-#: ../../ui/login.glade:230
-msgid "N_ickname:"
-msgstr "N_ickname:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "New Message"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:80
-msgid "Nickname:"
-msgstr "Nickname:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
 
-#: ../../ui/login.glade:661
-msgid "No authentication re_quired"
-msgstr "No authentication re_quired"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:275
-msgid "No conversations in folder."
-msgstr "No conversations in folder."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:244
-msgid "No conversations selected."
-msgstr "No conversations selected."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:273
-msgid "No search results found."
-msgstr "No search results found."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:128
-#: ../../src/engine/api/geary-special-folder-type.vala:58
-msgid "None"
-msgstr "None"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr ""
+
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr ""
+
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Choose a file"
+
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Attach"
+
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr ""
+
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Accounts"
+
+#. / 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/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Welcome to Geary."
+
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Enter your account information to get started."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 weeks back"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 month back"
 
-#: ../../ui/preferences.glade:158
-msgid "Notifications"
-msgstr "Notifications"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 months back"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 months back"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 year back"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr ""
 
-#: ../../src/client/util/util-date.vala:164
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Everything"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "Remem_ber passwords"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "Remem_ber password"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Unable to validate:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Invalid account nickname.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+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:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; IMAP connection error.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; IMAP username or password incorrect.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; SMTP connection error.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; SMTP username or password incorrect.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Connection error.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Username or password incorrect.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Save"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Add"
+
+#. / 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 "%l:%M %P"
+
+#. / 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 "%B %-e, %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 %-l:%M %P"
+
+#: ../src/client/util/util-date.vala:164
 msgid "Now"
 msgstr "Now"
 
-#. / 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/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#. / 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:"
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Open"
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Yesterday"
 
-#: ../../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Other"
+#. / 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
+msgid "%A"
+msgstr "%A"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Outbox"
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "bytes"
 
-#: ../../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "TB"
 
-#: ../../src/client/geary-args.vala:10
-msgid "Output debugging information"
-msgstr "Output debugging information"
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "GB"
 
-#: ../../ui/login.glade:337
-msgid "P_ort:"
-msgstr "P_ort:"
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "MB"
 
-#: ../../ui/login.glade:474
-msgid "Pass_word:"
-msgstr "Pass_word:"
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "KB"
 
-#: ../../ui/login.glade:101
-msgid "Password"
-msgstr "Password"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d message"
+msgstr[1] "%d messages"
 
-#: ../../ui/password-dialog.glade:196
-msgid "Password:"
-msgstr "Password:"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d unread"
+msgstr[1] "%d unread"
 
-#: ../../ui/composer.glade:102
-msgid "Paste _With Formatting"
-msgstr "Paste _With Formatting"
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your email password"
-msgstr "Please enter your e-mail password"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Inboxes"
 
-#: ../../src/client/geary-args.vala:47
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Please report comments, suggestions and bugs to:"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Search %s account"
 
-#: ../../ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
-msgstr "Please wait while Geary validates your account."
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:421
-msgid "Por_t:"
-msgstr "Por_t:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "No conversations selected."
 
-#: ../../ui/password-dialog.glade:367 ../../ui/password-dialog.glade:470
-msgid "Port:"
-msgstr "Port:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:81
-msgid "Quote text  (Ctrl+])"
-msgstr "Quote text  (Ctrl+])"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
+msgstr "No search results found."
 
-#: ../../src/client/geary-controller.vala:322
-msgid "R_eply All"
-msgstr "R_eply All"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
+msgstr "No conversations in folder."
 
-#: ../../ui/preferences.glade:55
-msgid "Reading"
-msgstr "Reading"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
+msgstr "This message contains remote images."
 
-#: ../../ui/password-dialog.glade:274
-msgid "Real name:"
-msgstr "Real name:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr "Show Images"
 
-#: ../../src/client/accounts/add-edit-page.vala:590
-msgid "Remem_ber password"
-msgstr "Remem_ber password"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
+msgstr "Always Show From Sender"
 
-#: ../../src/client/accounts/add-edit-page.vala:583
-msgid "Remem_ber passwords"
-msgstr "Remem_ber passwords"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
+msgstr "Edit Draft"
 
-#: ../../ui/account_list.glade:97
-msgid "Remove account"
-msgstr "Remove account"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "From:"
 
-#: ../../ui/composer.glade:95
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Remove formatting (Ctrl+Space)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "To:"
 
-#: ../../src/client/geary-controller.vala:318
-msgid "Reply (Ctrl+R, R)"
-msgstr "Reply (Ctrl+R, R)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Cc:"
 
-#: ../../src/client/geary-controller.vala:323
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
-msgstr "Reply all (Ctrl+Shift+R, Shift+R)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Bcc:"
 
-#: ../../src/client/views/conversation-viewer.vala:1452
-msgid "Reply to _All"
-msgstr "Reply to _All"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "Subject:"
 
-#: ../../ui/password-dialog.glade:163
-msgid "SMTP Credentials"
-msgstr "SMTP Credentials"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Date:"
 
-#: ../../ui/login.glade:507
-msgid "SMTP password"
-msgstr "SMTP password"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:439 ../../ui/password-dialog.glade:437
-msgid "SMTP settings"
-msgstr "SMTP settings"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
+msgstr ""
 
-#: ../../ui/login.glade:491
-msgid "SMTP username"
-msgstr "SMTP username"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "_Copy"
 
-#: ../../src/client/dialogs/password-dialog.vala:124
-msgid "SSL"
-msgstr "SSL"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "Copy _E-mail Address"
 
-#: ../../ui/password-dialog.glade:382 ../../ui/password-dialog.glade:485
-msgid "SSL/TLS encryption:"
-msgstr "SSL/TLS encryption:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "Copy _Link"
 
-#: ../../src/client/dialogs/password-dialog.vala:126
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
+msgstr "Select _Message"
 
-#: ../../ui/composer.glade:169
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Select _All"
 
-#: ../../ui/composer.glade:175
-msgid "S_erif"
-msgstr "S_erif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "_Inspect"
 
-#: ../../ui/login.glade:160
-msgid "S_ervice:"
-msgstr "S_ervice:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr "This link appears to go to"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
+msgstr "but actually goes to"
 
-#: ../../ui/composer.glade:170
-msgid "Sans Serif"
-msgstr "Sans Serif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
+msgstr " (Invalid?)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
+msgstr "_Save Image As..."
 
-#: ../../src/client/views/conversation-viewer.vala:1437
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_Save As..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "Save All A_ttachments..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
 msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] "Save A_ttachment..."
 msgstr[1] "Save All A_ttachments..."
 
-#: ../../src/client/views/conversation-viewer.vala:1400
-msgid "Save All A_ttachments..."
-msgstr "Save All A_ttachments..."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "Reply to _All"
 
-#: ../../src/client/composer/composer-window.vala:41
-msgid "Saved"
-msgstr "Saved"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "_Mark as Read"
 
-#: ../../src/client/composer/composer-window.vala:42
-msgid "Saving"
-msgstr "Saving"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "_Mark as Unread"
 
-#: ../../ui/login.glade:304
-msgid "Se_rver:"
-msgstr "Se_rver:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
+msgstr "Mark Unread From _Here"
 
-#: ../../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"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "_View Source"
 
-#: ../../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"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "Failed to open default text editor."
 
-#: ../../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)"
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr "%s - Conversation Inspector"
 
-#: ../../src/client/composer/composer-window.vala:1243
-msgid "Select Color"
-msgstr "Select Colour"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Saved"
 
-#: ../../src/client/ui/stock.vala:32
-#: ../../src/client/views/conversation-viewer.vala:916
-msgid "Select _All"
-msgstr "Select _All"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Saving"
 
-#: ../../src/client/views/conversation-viewer.vala:910
-msgid "Select _Message"
-msgstr "Select _Message"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Error saving"
 
-#: ../../src/client/geary-application.vala:27
-msgid "Send and receive email"
-msgstr "Send and receive e-mail"
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:747
-msgid "Send message with an empty body?"
-msgstr "Send message with an empty body?"
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "New Message"
+
+#: ../src/client/composer/composer-widget.vala:138
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Do you want to discard this message?"
 
-#: ../../src/client/composer/composer-window.vala:743
+#: ../src/client/composer/composer-widget.vala:1262
 msgid "Send message with an empty subject and body?"
 msgstr "Send message with an empty subject and body?"
 
-#: ../../src/client/composer/composer-window.vala:745
+#: ../src/client/composer/composer-widget.vala:1264
 msgid "Send message with an empty subject?"
 msgstr "Send message with an empty subject?"
 
-#: ../../src/client/composer/composer-window.vala:749
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Send message with an empty body?"
+
+#: ../src/client/composer/composer-widget.vala:1268
 msgid "Send message without an attachment?"
 msgstr "Send message without an attachment?"
 
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Cannot add attachment"
+
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "\"%s\" could not be found."
+
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" is a folder."
+
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" is an empty file."
+
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "\"%s\" could not be opened for reading."
+
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "\"%s\" already attached for delivery."
+
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Select Colour"
+
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr ""
+
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr ""
+
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../../src/client/ui/status-bar.vala:25
+#: ../src/client/components/status-bar.vala:26
 msgid "Sending..."
 msgstr "Sending..."
 
-#: ../../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Sent Mail"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:404
-msgid "Ser_ver:"
-msgstr "Ser_ver:"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:176
-msgid "Serif"
-msgstr "Serif"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "not found"
 
-#: ../../ui/password-dialog.glade:352 ../../ui/password-dialog.glade:455
-msgid "Server:"
-msgstr "Server:"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_OK"
 
-#: ../../ui/password-dialog.glade:259
-msgid "Service:"
-msgstr "Service:"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Cancel"
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "Show Images"
-msgstr "Show Images"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Close"
 
-#: ../../ui/preferences.glade:193
-msgid "Show _notifications for new mail"
-msgstr "Show _notifications for new mail"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Discard"
 
-#: ../../ui/composer.glade:164
-msgid "Small"
-msgstr "Small"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Open"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Spam"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Print..."
 
-#: ../../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Starred"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Remove"
 
-#: ../../ui/login.glade:761
-msgid "Storage"
-msgstr "Storage"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Keep"
 
-#: ../../ui/composer.glade:134
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Strikethrough (Ctrl+K)"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Search all mail in account for keywords (Ctrl+S)"
 
-#: ../../src/client/views/conversation-viewer.vala:617
-msgid "Subject:"
-msgstr "Subject:"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Indexing %s account"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Subject: %s\n"
+#~ msgid "%d results"
+#~ msgstr "%d results"
 
-#: ../../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#~ msgid "%i matches"
+#~ msgstr "%i matches"
 
-#: ../../src/client/geary-controller.vala:1493
-#, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr ""
-"The file already exists in '%s'.  Replacing it will overwrite its contents."
+#~ msgid "%i matches (wrapped)"
+#~ msgstr "%i matches (wrapped)"
 
-#: ../../src/client/geary-controller.vala:747
-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."
+#~ msgid "%u conversations selected."
+#~ msgstr "%u conversations selected."
 
-#: ../../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."
+#~ msgid "%u read messages"
+#~ msgstr "%u read messages"
 
-#: ../../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"
+#~ 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> "
 
-#: ../../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 "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
 
-#: ../../src/client/views/conversation-viewer.vala:1147
-msgid "This link appears to go to"
-msgstr "This link appears to go to"
+#~ 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/views/conversation-viewer.vala:508
-msgid "This message contains remote images."
-msgstr "This message contains remote images."
+#~ msgid "Add account"
+#~ msgstr "Add account"
 
-#: ../../ui/composer.glade:435
-msgid "To add them as attachments"
-msgstr "To add them as attachments"
+#~ 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/views/conversation-viewer.vala:608
-msgid "To:"
-msgstr "To:"
+#~ msgid "Archive conversation (Delete, Backspace, A)"
+#~ msgstr "Archive conversation (Delete, Backspace, A)"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "To: %s\n"
+#~ msgid "Archive conversations (Delete, Backspace, A)"
+#~ msgstr "Archive conversations (Delete, Backspace, A)"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Rubbish Bin"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Bold (Ctrl+B)"
 
-#: ../../src/client/geary-controller.vala:294
-msgid "U_nstar"
-msgstr "U_nstar"
+#~ msgid "C_olor"
+#~ msgstr "C_olour"
 
-#: ../../src/client/dialogs/password-dialog.vala:17
-msgid "Unable to login to email server"
-msgstr "Unable to log-in to e-mail server"
+#~ msgid "Compose Message"
+#~ msgstr "Compose Message"
 
-#: ../../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 "Composer"
+#~ msgstr "Composer"
 
-#: ../../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 "Copyright 2011-2013 Yorba Foundation"
+#~ msgstr "Copyright 2011-2013 Yorba Foundation"
 
-#: ../../src/client/geary-controller.vala:713
-#, c-format
-msgid "Unable to rebuild database for \"%s\""
-msgstr "Unable to rebuild database for \"%s\""
+#~ msgid "Cu_t"
+#~ msgstr "Cu_t"
 
-#: ../../src/client/accounts/add-edit-page.vala:619
-msgid "Unable to validate:\n"
-msgstr "Unable to validate:\n"
+#~ msgid "Delete conversation (Delete, Backspace, A)"
+#~ msgstr "Delete conversation (Delete, Backspace, A)"
 
-#: ../../ui/composer.glade:127
-msgid "Underline (Ctrl+U)"
-msgstr "Underline (Ctrl+U)"
+#~ msgid "Delete conversations (Delete, Backspace, A)"
+#~ msgstr "Delete conversations (Delete, Backspace, A)"
 
-#: ../../ui/composer.glade:88
-msgid "Unquote text (Ctrl+[)"
-msgstr "Unquote text (Ctrl+[)"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Do you want to discard the unsaved message?"
 
-#: ../../src/client/geary-args.vala:65
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Unrecognised command line option '%s'\n"
+#~ msgid "Drop files here"
+#~ msgstr "Drop files here"
 
-#: ../../ui/login.glade:457
-msgid "User_name:"
-msgstr "User_name:"
+#~ msgid "E_mail address:"
+#~ msgstr "E_mail address:"
 
-#: ../../ui/password-dialog.glade:70 ../../ui/password-dialog.glade:181
-msgid "Username:"
-msgstr "Username:"
+#~ msgid "Edit account"
+#~ msgstr "Edit account"
 
-#: ../../src/client/geary-application.vala:19
-msgid "Visit the Yorba web site"
-msgstr "Visit the Yorba web site"
+#~ msgid "Email address:"
+#~ msgstr "Email address:"
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-#, c-format
-msgid "Welcome to Geary."
-msgstr "Welcome to Geary."
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Email;E-mail;Mail;"
 
-#: ../../ui/login.glade:252
-msgid "Work, Home, etc."
-msgstr "Work, Home, etc."
+#~ msgid "Enable _spell checking"
+#~ msgstr "Enable _spell checking"
 
-#: ../../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid "Encr_yption:"
+#~ msgstr "Encr_yption:"
 
-#: ../../src/client/util/util-date.vala:177
-msgid "Yesterday"
-msgstr "Yesterday"
+#~ msgid "Encrypt_ion:"
+#~ msgstr "Encrypt_ion:"
 
-#: ../../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 "Fixed Width"
+#~ msgstr "Fixed Width"
 
-#: ../../src/client/geary-controller.vala:551
-msgid "Your settings are insecure"
-msgstr "Your settings are insecure"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary Mail"
 
-#: ../../src/client/geary-controller.vala:258
-#: ../../src/client/ui/stock.vala:21
-msgid "_About"
-msgstr "_About"
+#~ msgid "General"
+#~ msgstr "General"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:22
-msgid "_Add"
-msgstr "_Add"
+#~ msgid "IMAP Credentials"
+#~ msgstr "IMAP Credentials"
 
-#: ../../src/client/geary-controller.vala:47
-msgid "_Archive"
-msgstr "_Archive"
+#~ msgid "IMAP password"
+#~ msgstr "IMAP password"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Attach"
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP settings"
 
-#: ../../ui/composer.glade:525
-msgid "_Attach File"
-msgstr "_Attach File"
+#~ msgid "IMAP username"
+#~ msgstr "IMAP username"
 
-#: ../../ui/preferences.glade:69
-msgid "_Automatically select next message"
-msgstr "_Automatically select next message"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Italic (Ctrl+I)"
 
-#: ../../src/client/ui/stock.vala:19
-msgid "_Cancel"
-msgstr "_Cancel"
+#~ msgid "Lar_ge"
+#~ msgstr "Lar_ge"
 
-#: ../../ui/composer.glade:52
-msgid "_Center"
-msgstr "_Centre"
+#~ msgid "Large"
+#~ msgstr "Large"
 
-#: ../../src/client/ui/stock.vala:23
-msgid "_Close"
-msgstr "_Close"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Link (Ctrl+L)"
 
-#: ../../src/client/views/conversation-viewer.vala:889
-msgid "_Copy"
-msgstr "_Copy"
+#~ msgid "Medium"
+#~ msgstr "Medium"
 
-#: ../../src/client/geary-controller.vala:42
-msgid "_Delete"
-msgstr "_Delete"
+#~ msgid "More options"
+#~ msgstr "More options"
 
-#: ../../ui/password-dialog.glade:548
-msgid "_Details"
-msgstr "_Details"
+#~ msgid "N_ame:"
+#~ msgstr "N_ame:"
 
-#: ../../src/client/ui/stock.vala:24
-msgid "_Discard"
-msgstr "_Discard"
+#~ msgid "N_ickname:"
+#~ msgstr "N_ickname:"
 
-#: ../../ui/preferences.glade:90
-msgid "_Display conversation preview"
-msgstr "_Display conversation preview"
+#~ msgid "Nickname:"
+#~ msgstr "Nickname:"
 
-#: ../../src/client/geary-controller.vala:262
-msgid "_Donate"
-msgstr "_Donate"
+#~ msgid "No authentication re_quired"
+#~ msgstr "No authentication re_quired"
 
-#: ../../ui/login.glade:782
-msgid "_Download mail:"
-msgstr "_Download mail:"
+#~ msgid "Notifications"
+#~ msgstr "Notifications"
 
-#: ../../ui/composer.glade:181
-msgid "_Fixed Width"
-msgstr "_Fixed Width"
+#~ msgid "P_ort:"
+#~ msgstr "P_ort:"
 
-#: ../../src/client/geary-controller.vala:328
-#: ../../src/client/views/conversation-viewer.vala:1457
-msgid "_Forward"
-msgstr "_Forward"
+#~ msgid "Pass_word:"
+#~ msgstr "Pass_word:"
 
-#: ../../src/client/geary-controller.vala:254
-#: ../../src/client/ui/stock.vala:25
-msgid "_Help"
-msgstr "_Help"
+#~ msgid "Password"
+#~ msgstr "Password"
 
-#: ../../ui/composer.glade:542
-msgid "_Include Original Attachments"
-msgstr "_Include Original Attachments"
+#~ msgid "Password:"
+#~ msgstr "Password:"
 
-#: ../../src/client/views/conversation-viewer.vala:922
-msgid "_Inspect"
-msgstr "_Inspect"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Paste _With Formatting"
 
-#: ../../ui/composer.glade:57
-msgid "_Justify"
-msgstr "_Justify"
+#~ msgid "Please enter your email password"
+#~ msgstr "Please enter your e-mail password"
 
-#: ../../src/client/ui/stock.vala:33
-msgid "_Keep"
-msgstr "_Keep"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Please wait while Geary validates your account."
 
-#: ../../src/client/geary-controller.vala:305
-msgid "_Label"
-msgstr "_Label"
+#~ msgid "Por_t:"
+#~ msgstr "Por_t:"
 
-#: ../../ui/composer.glade:42
-msgid "_Left"
-msgstr "_Left"
+#~ msgid "Port:"
+#~ msgstr "Port:"
 
-#: ../../src/client/views/conversation-viewer.vala:1469
-msgid "_Mark as Read"
-msgstr "_Mark as Read"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Quote text  (Ctrl+])"
 
-#: ../../src/client/views/conversation-viewer.vala:1473
-msgid "_Mark as Unread"
-msgstr "_Mark as Unread"
+#~ msgid "Reading"
+#~ msgstr "Reading"
 
-#: ../../src/client/geary-controller.vala:271
-msgid "_Mark as..."
-msgstr "_Mark as..."
+#~ msgid "Real name:"
+#~ msgstr "Real name:"
 
-#: ../../ui/composer.glade:157
-msgid "_Medium"
-msgstr "_Medium"
+#~ msgid "Remove account"
+#~ msgstr "Remove account"
 
-#: ../../src/client/geary-controller.vala:309
-msgid "_Move"
-msgstr "_Move"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Remove formatting (Ctrl+Space)"
 
-#: ../../src/client/ui/stock.vala:18
-msgid "_OK"
-msgstr "_OK"
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP Credentials"
 
-#: ../../src/client/ui/stock.vala:26
-msgid "_Open"
-msgstr "_Open"
+#~ msgid "SMTP password"
+#~ msgstr "SMTP password"
 
-#: ../../ui/login.glade:131 ../../ui/login.glade:539
-#: ../../ui/password-dialog.glade:85
-msgid "_Password:"
-msgstr "_Password:"
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP settings"
 
-#: ../../ui/composer.glade:35
-msgid "_Paste"
-msgstr "_Paste"
+#~ msgid "SMTP username"
+#~ msgstr "SMTP username"
 
-#: ../../ui/preferences.glade:172
-msgid "_Play notification sounds"
-msgstr "_Play notification sounds"
+#~ msgid "SSL"
+#~ msgstr "SSL"
 
-#: ../../src/client/geary-controller.vala:250
-#: ../../src/client/ui/stock.vala:27
-msgid "_Preferences"
-msgstr "_Preferences"
+#~ msgid "SSL/TLS encryption:"
+#~ msgstr "SSL/TLS encryption:"
 
-#: ../../src/client/ui/stock.vala:28
-msgid "_Print..."
-msgstr "_Print..."
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../../src/client/geary-controller.vala:266
-#: ../../src/client/ui/stock.vala:29
-msgid "_Quit"
-msgstr "_Quit"
+#~ msgid "S_ans Serif"
+#~ msgstr "S_ans Serif"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "_Rebuild"
-msgstr "_Rebuild"
+#~ msgid "S_erif"
+#~ msgstr "S_erif"
 
-#: ../../ui/composer.glade:14
-msgid "_Redo"
-msgstr "_Redo"
+#~ msgid "S_ervice:"
+#~ msgstr "S_ervice:"
 
-#: ../../ui/password-dialog.glade:561
-msgid "_Remember passwords"
-msgstr "_Remember passwords"
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../../src/client/ui/stock.vala:30
-msgid "_Remove"
-msgstr "_Remove"
+#~ msgid "Se_rver:"
+#~ msgstr "Se_rver:"
 
-#: ../../src/client/geary-controller.vala:1496
-msgid "_Replace"
-msgstr "_Replace"
+#~ msgid "Send and receive email"
+#~ msgstr "Send and receive e-mail"
 
-#: ../../src/client/geary-controller.vala:317
-#: ../../src/client/views/conversation-viewer.vala:1447
-msgid "_Reply"
-msgstr "_Reply"
+#~ msgid "Ser_ver:"
+#~ msgstr "Ser_ver:"
 
-#: ../../ui/composer.glade:141
-msgid "_Rich Text"
-msgstr "_Rich Text"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../../ui/composer.glade:47
-msgid "_Right"
-msgstr "_Right"
+#~ msgid "Server:"
+#~ msgstr "Server:"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:31
-msgid "_Save"
-msgstr "_Save"
+#~ msgid "Service:"
+#~ msgstr "Service:"
 
-#: ../../src/client/views/conversation-viewer.vala:1395
-msgid "_Save As..."
-msgstr "_Save As..."
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Show _notifications for new mail"
 
-#: ../../src/client/views/conversation-viewer.vala:1414
-msgid "_Save Image As..."
-msgstr "_Save Image As..."
+#~ msgid "Small"
+#~ msgstr "Small"
 
-#: ../../ui/composer.glade:594
-msgid "_Send"
-msgstr "_Send"
+#~ msgid "Storage"
+#~ msgstr "Storage"
 
-#: ../../ui/composer.glade:163
-msgid "_Small"
-msgstr "_Small"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Strikethrough (Ctrl+K)"
 
-#: ../../src/client/geary-controller.vala:289
-msgid "_Star"
-msgstr "_Star"
+#~ msgid "To add them as attachments"
+#~ msgstr "To add them as attachments"
 
-#: ../../ui/composer.glade:7
-msgid "_Undo"
-msgstr "_Undo"
+#~ msgid "Unable to login to email server"
+#~ msgstr "Unable to log-in to e-mail server"
 
-#: ../../ui/login.glade:522
-msgid "_Username:"
-msgstr "_Username:"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Underline (Ctrl+U)"
 
-#: ../../src/client/views/conversation-viewer.vala:1494
-msgid "_View Source"
-msgstr "_View Source"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Unquote text (Ctrl+[)"
 
-#. / 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 "User_name:"
+#~ msgstr "User_name:"
 
-#: ../../src/client/views/conversation-viewer.vala:1148
-msgid "but actually goes to"
-msgstr "but actually goes to"
+#~ msgid "Username:"
+#~ msgstr "Username:"
 
-#: ../../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "bytes"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Work, Home, etc."
 
-#. / 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 "_Attach File"
+#~ msgstr "_Attach File"
 
-#: ../../src/client/views/conversation-find-bar.vala:226
-msgid "not found"
-msgstr "not found"
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Automatically select next message"
 
-#. / 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 "_Center"
+#~ msgstr "_Centre"
+
+#~ msgid "_Delete"
+#~ msgstr "_Delete"
+
+#~ msgid "_Details"
+#~ msgstr "_Details"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Display conversation preview"
+
+#~ msgid "_Donate"
+#~ msgstr "_Donate"
+
+#~ msgid "_Download mail:"
+#~ msgstr "_Download mail:"
+
+#~ msgid "_Fixed Width"
+#~ msgstr "_Fixed Width"
+
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Include Original Attachments"
+
+#~ msgid "_Justify"
+#~ msgstr "_Justify"
+
+#~ msgid "_Left"
+#~ msgstr "_Left"
+
+#~ msgid "_Medium"
+#~ msgstr "_Medium"
+
+#~ msgid "_Password:"
+#~ msgstr "_Password:"
+
+#~ msgid "_Paste"
+#~ msgstr "_Paste"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Play notification sounds"
+
+#~ msgid "_Redo"
+#~ msgstr "_Redo"
+
+#~ msgid "_Remember passwords"
+#~ msgstr "_Remember passwords"
+
+#~ msgid "_Rich Text"
+#~ msgstr "_Rich Text"
+
+#~ msgid "_Right"
+#~ msgstr "_Right"
+
+#~ msgid "_Send"
+#~ msgstr "_Send"
+
+#~ msgid "_Small"
+#~ msgstr "_Small"
+
+#~ msgid "_Undo"
+#~ msgstr "_Undo"
+
+#~ msgid "_Username:"
+#~ msgstr "_Username:"
+
+#~ msgid "attach|enclosed|enclosing|cover letter"
+#~ msgstr "attach|enclosed|enclosing|cover letter"
diff --git a/po/eo.po b/po/eo.po
index 6e2f4b7..2c76771 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -11,1500 +11,1422 @@ 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-20 19:28+0000\n"
-"Last-Translator: yorbajim <jim yorba org>\n"
-"Language-Team: Esperanto (http://www.transifex.com/projects/p/geary/language/";
-"eo/)\n"
-"Language: eo\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:01+0000\n"
+"Last-Translator: Jim Nelson <jim yorba org>\n"
+"Language-Team: Esperanto "
+"(http://www.transifex.com/projects/p/geary/language/eo/)\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"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:54+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: eo\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:641
-msgid "        &#8226; Connection error.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:624
-msgid "        &#8226; Email address already added to Geary.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:628
-msgid "        &#8226; IMAP connection error.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:631
-msgid "        &#8226; IMAP username or password incorrect.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:621
-msgid "        &#8226; Invalid account nickname.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:634
-msgid "        &#8226; SMTP connection error.\n"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Enirkesto"
 
-#: ../../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Malnetoj"
 
-#: ../../src/client/accounts/add-edit-page.vala:645
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Mesaĝo sendita"
 
-#: ../../src/client/views/conversation-viewer.vala:1203
-msgid " (Invalid?)"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Kun stelo"
 
-#: ../../src/client/composer/composer-window.vala:972
-#, c-format
-msgid "\"%s\" already attached for delivery."
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:937
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Ĉiuj mesaĝoj"
 
-#: ../../src/client/composer/composer-window.vala:965
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Trudmesaĝoj"
 
-#: ../../src/client/composer/composer-window.vala:944
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Rubujo"
 
-#: ../../src/client/composer/composer-window.vala:951
-#, c-format
-msgid "\"%s\" is an empty file."
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
 msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
 msgstr ""
 
-#. / 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"
-
-#. / 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 "%B %-e, %Y %-l:%M %P"
-
-#. / 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 "%B %-e, %Y %-l:%M %P"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Neniu nomo"
 
-#. / 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, %b %-e, %Y at %-l:%M %p"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr ""
 
-#. / 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 "%b %-e"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr ""
 
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] ""
-msgstr[1] ""
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d nova mesaĝo"
-msgstr[1] "%d novaj mesaĝoj"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:43
-#, c-format
-msgid "%d results"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
 msgstr ""
 
-#. / 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] ""
-msgstr[1] ""
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Alia"
 
-#: ../../src/client/util/util-date.vala:170
-#, c-format
-msgid "%dh ago"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
 msgstr ""
 
-#: ../../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
 msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:222
-#, c-format
-msgid "%i matches"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
 msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:224
-#, c-format
-msgid "%i matches (wrapped)"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
 msgstr ""
 
-#. / 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 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"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:107
-#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
-msgstr[1] ""
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr ""
 
-#. / 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)"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
 msgstr ""
 
-#: ../../src/client/views/conversation-web-view.vala:289
-#, c-format
-msgid "%s - Conversation Inspector"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
 msgstr ""
 
-#: ../../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(neniu temo)"
+
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %b %-e, %Y at %-l:%M %p"
+
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
 msgstr ""
 
 #. / 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
+#: ../src/engine/rfc822/rfc822-utils.vala:228
 msgid "%s wrote:"
 msgstr "%s skribis:"
 
-#: ../../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] ""
-msgstr[1] ""
-
-#. / 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"
+#. / 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:234
+msgid "On %s:"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:246
-#, c-format
-msgid "%u conversations selected."
-msgstr "%u konversacioj elektitaj."
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Plusendita mesaĝo ----------"
 
-#: ../../src/client/views/conversation-viewer.vala:743
-#, c-format
-msgid "%u read messages"
-msgstr ""
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "El: %s\n"
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr ""
 
-#: ../../src/client/util/util-email.vala:30
-msgid "(no subject)"
-msgstr "(neniu temo)"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Dato: %s\n"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Plusendita mesaĝo ----------"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Al: %s\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:211
-msgid "1 month back"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:214
-msgid "1 year back"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:210
-msgid "2 weeks back"
-msgstr ""
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Retpoŝtilo"
 
-#: ../../src/client/accounts/add-edit-page.vala:212
-msgid "3 months back"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:213
-msgid "6 months back"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
 msgstr ""
 
-#: ../../ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
 msgstr ""
 
-#: ../../ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#: ../src/client/application/geary-controller.vala:62
+msgid "Delete conversation (Shift+Delete)"
 msgstr ""
 
-#: ../../ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/application/geary-controller.vala:63
+msgid "Delete conversations (Shift+Delete)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1491
-#, c-format
-msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr "Dosiero nomita \"%s\" jam ekzistas. Ĉu vi volas anstataŭigi ĝin?"
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:245
-msgid "A_ccounts"
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1227
-#, c-format
-msgid "About %s"
-msgstr "Pri %s"
+#: ../src/client/application/geary-controller.vala:72
+msgid "_Archive"
+msgstr "Enarkivigi"
 
-#: ../../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
+#: ../src/client/application/geary-controller.vala:73
+msgid "Archive conversation (A)"
 msgstr ""
 
-#: ../../ui/account_list.glade:71
-msgid "Add account"
+#: ../src/client/application/geary-controller.vala:74
+msgid "Archive conversations (A)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:304
-msgid "Add label"
+#: ../src/client/application/geary-controller.vala:77
+msgid "Mark as S_pam"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:57
-msgid "Add label to conversation"
+#: ../src/client/application/geary-controller.vala:78
+msgid "Mark as not S_pam"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:58
-msgid "Add label to conversations"
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
+msgid "Mark conversation"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Ĉiuj mesaĝoj"
+#: ../src/client/application/geary-controller.vala:81
+msgid "Mark conversations"
+msgstr ""
 
-#: ../../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."
+#: ../src/client/application/geary-controller.vala:82
+msgid "Add label to conversation"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:24
-msgid "Allow inspection of WebView"
+#: ../src/client/application/geary-controller.vala:83
+msgid "Add label to conversations"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:509
-msgid "Always Show From Sender"
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
+msgid "Move conversation"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
+#: ../src/client/application/geary-controller.vala:85
+msgid "Move conversations"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:48
-msgid "Archive conversation (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:372
+msgid "A_ccounts"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:49
-msgid "Archive conversations (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:377
+#: ../src/client/components/stock.vala:27
+msgid "_Preferences"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1477
-#, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr "Ĉu vi vere volas malfermi je \"%s\"?"
+#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/components/stock.vala:25
+msgid "_Help"
+msgstr "_Helpo"
 
-#: ../../src/client/geary-controller.vala:1478
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
+#: ../src/client/application/geary-controller.vala:385
+#: ../src/client/components/stock.vala:21
+msgid "_About"
+msgstr "Pri"
+
+#: ../src/client/application/geary-controller.vala:389
+#: ../src/client/components/stock.vala:29
+msgid "_Quit"
 msgstr ""
-"Kunsendaĵoj povas kaŭzi damaĝojn al via sistemo. Nur malfermu dosierojn el "
-"fidindaj fontoj."
 
-#: ../../src/client/views/conversation-viewer.vala:614
-msgid "Bcc:"
-msgstr "Kaŝkopio:"
+#: ../src/client/application/geary-controller.vala:394
+msgid "_Mark as..."
+msgstr ""
 
-#: ../../ui/composer.glade:113
-msgid "Bold (Ctrl+B)"
+#: ../src/client/application/geary-controller.vala:400
+msgid "Mark as _Read"
 msgstr ""
 
-#: ../../ui/composer.glade:69
-msgid "C_olor"
+#: ../src/client/application/geary-controller.vala:406
+msgid "Mark as _Unread"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:926
-msgid "Cannot add attachment"
-msgstr "Ne aldoneblas kunsendaĵon"
+#: ../src/client/application/geary-controller.vala:412
+msgid "_Star"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:611
-msgid "Cc:"
-msgstr "Kopio:"
+#: ../src/client/application/geary-controller.vala:417
+msgid "U_nstar"
+msgstr "Forigi stelo_n"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
+#: ../src/client/application/geary-controller.vala:427
+msgid "Add label"
 msgstr ""
 
-#: ../../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Elektu dosieron"
-
-#: ../../src/client/geary-controller.vala:553
-msgid "Co_ntinue"
-msgstr "A_ntaŭiri"
+#: ../src/client/application/geary-controller.vala:428
+msgid "_Label"
+msgstr "Etikedi"
 
-#: ../../src/client/geary-application.vala:29
-msgid "Compose Message"
-msgstr "Verki mesaĝon"
+#: ../src/client/application/geary-controller.vala:432
+msgid "_Move"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:313
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr ""
 
-#: ../../ui/preferences.glade:117
-msgid "Composer"
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
+msgid "_Reply"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:897
-msgid "Copy _Email Address"
+#: ../src/client/application/geary-controller.vala:441
+msgid "Reply (Ctrl+R, R)"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:902
-msgid "Copy _Link"
+#: ../src/client/application/geary-controller.vala:445
+msgid "R_eply All"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
+#: ../src/client/application/geary-controller.vala:446
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr ""
 
-#: ../../ui/composer.glade:21
-msgid "Cu_t"
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
+msgid "_Forward"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:620
-msgid "Date:"
-msgstr "Dato:"
-
-#: ../../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "Dato: %s\n"
+#: ../src/client/application/geary-controller.vala:452
+msgid "Forward (Ctrl+L, F)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:43
-msgid "Delete conversation (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:44
-msgid "Delete conversations (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:25
-msgid "Display program version"
-msgstr "Montri programversion"
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:663
-msgid "Do you want to discard the unsaved message?"
-msgstr "Ĉu vi volas forigi la nekonservitan dosieron?"
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:666
-msgid "Do you want to discard this message?"
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1479
-msgid "Don't _ask me again"
-msgstr "Ne demandi min denove"
+#: ../src/client/application/geary-controller.vala:746
+msgid "Unable to store server trust exception"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Malnetoj"
+#: ../src/client/application/geary-controller.vala:983
+msgid "Your settings are insecure"
+msgstr "Viaj agordoj estas malsekuraj."
 
-#: ../../ui/composer.glade:419
-msgid "Drop files here"
+#: ../src/client/application/geary-controller.vala:984
+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 ""
+"Viaj agordoj por IMAP kaj/aŭ SMTP ne specifas je SSL nek je TLS. Tio "
+"signifas, ke viaj uzantnomo kaj pasvorto povas esti legitaj de alia persono "
+"en la reto. Ĉu vi vere volas fari tion?"
 
-#: ../../ui/login.glade:115
-msgid "E_mail address:"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:985
+msgid "Co_ntinue"
+msgstr "A_ntaŭiri"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "E_xit"
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/components/status-bar.vala:29
+msgid "Error sending email"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:533
-msgid "Edit Draft"
+#: ../src/client/application/geary-controller.vala:1064
+msgid ""
+"Geary encountered an error sending an email.  If the problem persists, "
+"please manually delete the email from your Outbox folder."
 msgstr ""
 
-#: ../../ui/account_list.glade:84
-msgid "Edit account"
+#: ../src/client/application/geary-controller.vala:1068
+#: ../src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
 msgstr ""
 
-#: ../../ui/remove_confirm.glade:94
-msgid "Email address:"
+#: ../src/client/application/geary-controller.vala:1069
+msgid ""
+"Geary encountered an error saving a sent message to Sent Mail.  The message "
+"will stay in your Outbox folder until you delete it."
 msgstr ""
 
-#: ../../src/client/geary-application.vala:28
-msgid "Email;E-mail;Mail;"
+#: ../src/client/application/geary-controller.vala:1138
+msgid "Labels"
+msgstr "Etikedoj"
+
+#: ../src/client/application/geary-controller.vala:1150
+msgid "Unable to open the database for %s"
 msgstr ""
 
-#: ../../ui/preferences.glade:131
-msgid "Enable _spell checking"
+#: ../src/client/application/geary-controller.vala:1151
+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 ""
 
-#: ../../ui/login.glade:588
-msgid "Encr_yption:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "_Rebuild"
 msgstr ""
 
-#: ../../ui/login.glade:607
-msgid "Encrypt_ion:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "E_xit"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-msgid "Enter your account information to get started."
-msgstr "Enigu vian kontan informon por komenciĝi."
+#: ../src/client/application/geary-controller.vala:1162
+msgid "Unable to rebuild database for \"%s\""
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:714
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:43
-msgid "Error saving"
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
+msgid "Unable to open local mailbox for %s"
 msgstr ""
 
-#. / 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"
+#: ../src/client/application/geary-controller.vala:1186
+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 ""
 
-#: ../../src/client/accounts/add-edit-page.vala:216
-msgid "Everything"
+#: ../src/client/application/geary-controller.vala:1196
+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 ""
 
-#: ../../src/client/views/conversation-viewer.vala:1897
-msgid "Failed to open default text editor."
-msgstr "Malsukcesis malfermi aprioran tekstredaktilon."
-
-#: ../../src/client/geary-args.vala:54
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Malsukcesis analizi komandliniajn opciojn: \"%s\"\n"
-
-#. / 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"
+#: ../src/client/application/geary-controller.vala:1207
+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 ""
 
-#: ../../ui/composer.glade:182
-msgid "Fixed Width"
+#: ../src/client/application/geary-controller.vala:1715
+msgid "About %s"
+msgstr "Pri %s"
+
+#. / Translators: add your name and email address to receive credit in the About dialog
+#. / For example: Yamada Taro <yamada taro example com>
+#: ../src/client/application/geary-controller.vala:1718
+msgid "translator-credits"
 msgstr ""
+"Launchpad Contributions:\n"
+"  Jim Nelson https://launchpad.net/~yorba-jim";
 
-#: ../../src/client/geary-controller.vala:329
-msgid "Forward (Ctrl+L, F)"
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:605
-msgid "From:"
-msgstr "El:"
+#: ../src/client/application/geary-controller.vala:1986
+msgid "Are you sure you want to open \"%s\"?"
+msgstr "Ĉu vi vere volas malfermi je \"%s\"?"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "El: %s\n"
+#: ../src/client/application/geary-controller.vala:1987
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
+"Kunsendaĵoj povas kaŭzi damaĝojn al via sistemo. Nur malfermu dosierojn el "
+"fidindaj fontoj."
 
-#: ../../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#: ../src/client/application/geary-controller.vala:1988
+msgid "Don't _ask me again"
+msgstr "Ne demandi min denove"
 
-#: ../../src/client/geary-application.vala:25
-msgid "Geary Mail"
-msgstr "Geary Mail"
+#: ../src/client/application/geary-controller.vala:2006
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr "Dosiero nomita \"%s\" jam ekzistas. Ĉu vi volas anstataŭigi ĝin?"
 
-#: ../../src/client/geary-controller.vala:626
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 
-#: ../../ui/password-dialog.glade:315
-msgid "General"
+#: ../src/client/application/geary-controller.vala:2011
+msgid "_Replace"
 msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/client/application/geary-controller.vala:2309
+msgid "Close open draft messages?"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:133
-msgid "IMAP Credentials"
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
 msgstr ""
 
-#: ../../ui/login.glade:572
-msgid "IMAP password"
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
 msgstr ""
 
-#: ../../ui/login.glade:286 ../../ui/password-dialog.glade:334
-msgid "IMAP settings"
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
 msgstr ""
 
-#: ../../ui/login.glade:556
-msgid "IMAP username"
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Enirkesto"
+#: ../src/client/application/geary-controller.vala:2489
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
+#: ../src/client/application/geary-controller.vala:2491
+msgid "Delete"
 msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:163
-#, c-format
-msgid "Indexing %s account"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
 msgstr ""
 
-#: ../../ui/composer.glade:120
-msgid "Italic (Ctrl+I)"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
 msgstr ""
 
-#: ../../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
-
-#: ../../src/client/geary-controller.vala:689
-msgid "Labels"
-msgstr "Etikedoj"
-
-#: ../../ui/composer.glade:151
-msgid "Lar_ge"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
 msgstr ""
 
-#: ../../ui/composer.glade:152
-msgid "Large"
-msgstr "Granda"
-
-#: ../../ui/composer.glade:62
-msgid "Link (Ctrl+L)"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
 msgstr ""
 
-#. / 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"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:11
+#: ../src/client/application/geary-args.vala:12
 msgid "Log conversation monitoring"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:21
-msgid "Log database queries (generates lots of messages)"
-msgstr ""
-
-#. / "Normalization" can also be called "synchronization"
-#: ../../src/client/geary-args.vala:23
-msgid "Log folder normalization"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:13
+#: ../src/client/application/geary-args.vala:14
 msgid "Log network activity"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:12
-msgid "Log network deserialization"
+#. / 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 ""
 
 #. / Serialization is how commands and responses are converted into a stream of bytes for
 #. / network transmission
-#: ../../src/client/geary-args.vala:19
+#: ../src/client/application/geary-args.vala:20
 msgid "Log network serialization"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:20
+#: ../src/client/application/geary-args.vala:21
 msgid "Log periodic activity"
 msgstr ""
 
-#: ../../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
-
-#: ../../src/client/geary-application.vala:26
-msgid "Mail Client"
-msgstr "Retpoŝtilo"
-
-#: ../../src/client/views/conversation-viewer.vala:1479
-msgid "Mark Unread From _Here"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:52
-msgid "Mark as S_pam"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:277
-msgid "Mark as _Read"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:283
-msgid "Mark as _Unread"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:53
-msgid "Mark as not S_pam"
-msgstr ""
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Montri programversion"
 
-#: ../../src/client/geary-controller.vala:55
-#: ../../src/client/geary-controller.vala:269
-msgid "Mark conversation"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:56
-msgid "Mark conversations"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
 msgstr ""
 
-#: ../../src/client/views/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Mi"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Malsukcesis analizi komandliniajn opciojn: \"%s\"\n"
 
-#: ../../ui/composer.glade:158
-msgid "Medium"
-msgstr ""
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Nekonata komandlinia opcio \"%s\"\n"
 
-#: ../../ui/composer.glade:75
-msgid "More options"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:59
-#: ../../src/client/geary-controller.vala:308
-msgid "Move conversation"
-msgstr ""
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d nova mesaĝo"
+msgstr[1] "%d novaj mesaĝoj"
 
-#: ../../src/client/geary-controller.vala:60
-msgid "Move conversations"
-msgstr ""
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:176
-msgid "N_ame:"
-msgstr ""
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:230
-msgid "N_ickname:"
-msgstr ""
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Malfermi"
 
-#: ../../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "Nova mesaĝo"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Mi"
 
-#: ../../ui/remove_confirm.glade:80
-msgid "Nickname:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
 msgstr ""
 
-#: ../../ui/login.glade:661
-msgid "No authentication re_quired"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:275
-msgid "No conversations in folder."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:244
-msgid "No conversations selected."
-msgstr "Neniu konversacio elektita."
-
-#: ../../src/client/views/conversation-viewer.vala:273
-msgid "No search results found."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:128
-#: ../../src/engine/api/geary-special-folder-type.vala:58
-msgid "None"
-msgstr "Neniu nomo"
-
-#: ../../ui/preferences.glade:158
-msgid "Notifications"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
 msgstr ""
 
-#: ../../src/client/util/util-date.vala:164
-msgid "Now"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
 msgstr ""
 
-#. / 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:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
 msgstr ""
 
-#. / 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:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
 msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Malfermi"
-
-#: ../../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Alia"
-
-#: ../../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
 msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:10
-msgid "Output debugging information"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
 msgstr ""
 
-#: ../../ui/login.glade:337
-msgid "P_ort:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
 msgstr ""
 
-#: ../../ui/login.glade:474
-msgid "Pass_word:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
 msgstr ""
 
-#: ../../ui/login.glade:101
-msgid "Password"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:196
-msgid "Password:"
-msgstr "Pasvorto:"
-
-#: ../../ui/composer.glade:102
-msgid "Paste _With Formatting"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your email password"
-msgstr "Bonvole enigu vian retpoŝtan pasvorton"
-
-#: ../../src/client/geary-args.vala:47
-msgid "Please report comments, suggestions and bugs to:"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
 msgstr ""
 
-#: ../../ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
-msgstr ""
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Elektu dosieron"
 
-#: ../../ui/login.glade:421
-msgid "Por_t:"
-msgstr ""
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "Kunsendi"
 
-#: ../../ui/password-dialog.glade:367 ../../ui/password-dialog.glade:470
-msgid "Port:"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
 msgstr ""
 
-#: ../../ui/composer.glade:81
-msgid "Quote text  (Ctrl+])"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:322
-msgid "R_eply All"
+#. / 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 ""
 
-#: ../../ui/preferences.glade:55
-msgid "Reading"
-msgstr ""
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Bonvenon en Geary."
 
-#: ../../ui/password-dialog.glade:274
-msgid "Real name:"
-msgstr ""
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Enigu vian kontan informon por komenciĝi."
 
-#: ../../src/client/accounts/add-edit-page.vala:590
-msgid "Remem_ber password"
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:583
-msgid "Remem_ber passwords"
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
 msgstr ""
 
-#: ../../ui/account_list.glade:97
-msgid "Remove account"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
 msgstr ""
 
-#: ../../ui/composer.glade:95
-msgid "Remove formatting (Ctrl+Space)"
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:318
-msgid "Reply (Ctrl+R, R)"
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:323
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1452
-msgid "Reply to _All"
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:163
-msgid "SMTP Credentials"
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
 msgstr ""
 
-#: ../../ui/login.glade:507
-msgid "SMTP password"
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
 msgstr ""
 
-#: ../../ui/login.glade:439 ../../ui/password-dialog.glade:437
-msgid "SMTP settings"
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
 msgstr ""
 
-#: ../../ui/login.glade:491
-msgid "SMTP username"
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:124
-msgid "SSL"
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:382 ../../ui/password-dialog.glade:485
-msgid "SSL/TLS encryption:"
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:126
-msgid "STARTTLS"
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
 msgstr ""
 
-#: ../../ui/composer.glade:169
-msgid "S_ans Serif"
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
 msgstr ""
 
-#: ../../ui/composer.glade:175
-msgid "S_erif"
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
 msgstr ""
 
-#: ../../ui/login.glade:160
-msgid "S_ervice:"
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
 msgstr ""
 
-#: ../../ui/composer.glade:170
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: ../../src/client/views/conversation-viewer.vala:1437
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "Konservi kunsendaĵon..."
-msgstr[1] "Konservi ĉiujn kunsendaĵojn..."
-
-#: ../../src/client/views/conversation-viewer.vala:1400
-msgid "Save All A_ttachments..."
-msgstr "Konservi ĉiujn kunsendaĵojn..."
-
-#: ../../src/client/composer/composer-window.vala:41
-msgid "Saved"
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:42
-msgid "Saving"
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
 msgstr ""
 
-#: ../../ui/login.glade:304
-msgid "Se_rver:"
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
 msgstr ""
 
-#: ../../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"
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
 msgstr ""
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:39
-#: ../../src/client/ui/main-toolbar.vala:170
-#, c-format
-msgid "Search %s account"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
 msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:76
-msgid "Search all mail in account for keywords (Ctrl+S)"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:1243
-msgid "Select Color"
-msgstr ""
+#. / 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"
 
-#: ../../src/client/ui/stock.vala:32
-#: ../../src/client/views/conversation-viewer.vala:916
-msgid "Select _All"
-msgstr "Elekti ĉion"
+#. / 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"
 
-#: ../../src/client/views/conversation-viewer.vala:910
-msgid "Select _Message"
-msgstr ""
+#. / 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"
 
-#: ../../src/client/geary-application.vala:27
-msgid "Send and receive email"
-msgstr "Sendi kaj ricevi retpoŝton"
+#. / 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 "%b %-e"
 
-#: ../../src/client/composer/composer-window.vala:747
-msgid "Send message with an empty body?"
-msgstr ""
+#. / 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"
 
-#: ../../src/client/composer/composer-window.vala:743
-msgid "Send message with an empty subject and body?"
-msgstr ""
+#. / 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 "%B %-e, %Y %-l:%M %P"
 
-#: ../../src/client/composer/composer-window.vala:745
-msgid "Send message with an empty subject?"
-msgstr ""
+#. / 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"
 
-#: ../../src/client/composer/composer-window.vala:749
-msgid "Send message without an attachment?"
-msgstr ""
+#. / 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 "%B %-e, %Y %-l:%M %P"
 
-#. / 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..."
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Mesaĝo sendita"
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:404
-msgid "Ser_ver:"
-msgstr ""
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:176
-msgid "Serif"
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:352 ../../ui/password-dialog.glade:455
-msgid "Server:"
+#. / 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
+msgid "%A"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:259
-msgid "Service:"
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "Show Images"
-msgstr ""
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "TB"
 
-#: ../../ui/preferences.glade:193
-msgid "Show _notifications for new mail"
-msgstr ""
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "GB"
 
-#: ../../ui/composer.glade:164
-msgid "Small"
-msgstr "Malgranda"
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "MB"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Trudmesaĝoj"
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "KB"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Kun stelo"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:761
-msgid "Storage"
-msgstr ""
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:134
-msgid "Strikethrough (Ctrl+K)"
+#. / 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
+msgid "%s, %s"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:617
-msgid "Subject:"
-msgstr "Temo:"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
 msgstr ""
 
-#: ../../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/geary-controller.vala:1493
-#, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "Neniu konversacio elektita."
 
-#: ../../src/client/geary-controller.vala:747
-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."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
 msgstr ""
 
-#: ../../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."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
 msgstr ""
 
-#: ../../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"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
 msgstr ""
 
-#: ../../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>"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1147
-msgid "This link appears to go to"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "This message contains remote images."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
 msgstr ""
 
-#: ../../ui/composer.glade:435
-msgid "To add them as attachments"
-msgstr "Por aldoni ilin kiel kunsendaĵoj"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "El:"
 
-#: ../../src/client/views/conversation-viewer.vala:608
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
 msgid "To:"
 msgstr "Al:"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "Al: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Kopio:"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Rubujo"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Kaŝkopio:"
 
-#: ../../src/client/geary-controller.vala:294
-msgid "U_nstar"
-msgstr "Forigi stelo_n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "Temo:"
 
-#: ../../src/client/dialogs/password-dialog.vala:17
-msgid "Unable to login to email server"
-msgstr "Ne konekteblas al retpoŝta servilo"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Dato:"
 
-#: ../../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 ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/geary-controller.vala:701
-#, c-format
-msgid "Unable to open the database for %s"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:713
-#, c-format
-msgid "Unable to rebuild database for \"%s\""
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "_Copii"
 
-#: ../../src/client/accounts/add-edit-page.vala:619
-msgid "Unable to validate:\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
 msgstr ""
 
-#: ../../ui/composer.glade:127
-msgid "Underline (Ctrl+U)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
 msgstr ""
 
-#: ../../ui/composer.glade:88
-msgid "Unquote text (Ctrl+[)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:65
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Nekonata komandlinia opcio \"%s\"\n"
-
-#: ../../ui/login.glade:457
-msgid "User_name:"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Elekti ĉion"
 
-#: ../../ui/password-dialog.glade:70 ../../ui/password-dialog.glade:181
-msgid "Username:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:19
-msgid "Visit the Yorba web site"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-#, c-format
-msgid "Welcome to Geary."
-msgstr "Bonvenon en Geary."
-
-#: ../../ui/login.glade:252
-msgid "Work, Home, etc."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
 msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
-
-#: ../../src/client/util/util-date.vala:177
-msgid "Yesterday"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
 msgstr ""
 
-#: ../../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?"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
 msgstr ""
-"Viaj agordoj por IMAP kaj/aŭ SMTP ne specifas je SSL nek je TLS. Tio "
-"signifas, ke viaj uzantnomo kaj pasvorto povas esti legitaj de alia persono "
-"en la reto. Ĉu vi vere volas fari tion?"
-
-#: ../../src/client/geary-controller.vala:551
-msgid "Your settings are insecure"
-msgstr "Viaj agordoj estas malsekuraj."
-
-#: ../../src/client/geary-controller.vala:258
-#: ../../src/client/ui/stock.vala:21
-msgid "_About"
-msgstr "Pri"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:22
-msgid "_Add"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:47
-msgid "_Archive"
-msgstr "Enarkivigi"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "Konservi ĉiujn kunsendaĵojn..."
 
-#: ../../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "Kunsendi"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] "Konservi kunsendaĵon..."
+msgstr[1] "Konservi ĉiujn kunsendaĵojn..."
 
-#: ../../ui/composer.glade:525
-msgid "_Attach File"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
 msgstr ""
 
-#: ../../ui/preferences.glade:69
-msgid "_Automatically select next message"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:19
-msgid "_Cancel"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
 msgstr ""
 
-#: ../../ui/composer.glade:52
-msgid "_Center"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:23
-msgid "_Close"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:889
-msgid "_Copy"
-msgstr "_Copii"
-
-#: ../../src/client/geary-controller.vala:42
-msgid "_Delete"
-msgstr "_Forigi"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "Malsukcesis malfermi aprioran tekstredaktilon."
 
-#: ../../ui/password-dialog.glade:548
-msgid "_Details"
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:24
-msgid "_Discard"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
 msgstr ""
 
-#: ../../ui/preferences.glade:90
-msgid "_Display conversation preview"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:262
-msgid "_Donate"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
 msgstr ""
 
-#: ../../ui/login.glade:782
-msgid "_Download mail:"
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
 msgstr ""
 
-#: ../../ui/composer.glade:181
-msgid "_Fixed Width"
-msgstr ""
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Nova mesaĝo"
 
-#: ../../src/client/geary-controller.vala:328
-#: ../../src/client/views/conversation-viewer.vala:1457
-msgid "_Forward"
+#: ../src/client/composer/composer-widget.vala:138
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:254
-#: ../../src/client/ui/stock.vala:25
-msgid "_Help"
-msgstr "_Helpo"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr ""
 
-#: ../../ui/composer.glade:542
-msgid "_Include Original Attachments"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:922
-msgid "_Inspect"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
 msgstr ""
 
-#: ../../ui/composer.glade:57
-msgid "_Justify"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:33
-msgid "_Keep"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:305
-msgid "_Label"
-msgstr "Etikedi"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Ne aldoneblas kunsendaĵon"
 
-#: ../../ui/composer.glade:42
-msgid "_Left"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1469
-msgid "_Mark as Read"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1473
-msgid "_Mark as Unread"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:271
-msgid "_Mark as..."
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
 msgstr ""
 
-#: ../../ui/composer.glade:157
-msgid "_Medium"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:309
-msgid "_Move"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:18
-msgid "_OK"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:26
-msgid "_Open"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
 msgstr ""
 
-#: ../../ui/login.glade:131 ../../ui/login.glade:539
-#: ../../ui/password-dialog.glade:85
-msgid "_Password:"
-msgstr "_Pasvorto:"
-
-#: ../../ui/composer.glade:35
-msgid "_Paste"
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
 msgstr ""
 
-#: ../../ui/preferences.glade:172
-msgid "_Play notification sounds"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:250
-#: ../../src/client/ui/stock.vala:27
-msgid "_Preferences"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:28
-msgid "_Print..."
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:266
-#: ../../src/client/ui/stock.vala:29
-msgid "_Quit"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:704
-msgid "_Rebuild"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
 msgstr ""
 
-#: ../../ui/composer.glade:14
-msgid "_Redo"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
 msgstr ""
 
-#: ../../ui/password-dialog.glade:561
-msgid "_Remember passwords"
-msgstr ""
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/ui/stock.vala:30
-msgid "_Remove"
-msgstr ""
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/geary-controller.vala:1496
-msgid "_Replace"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:317
-#: ../../src/client/views/conversation-viewer.vala:1447
-msgid "_Reply"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
 msgstr ""
 
-#: ../../ui/composer.glade:141
-msgid "_Rich Text"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
 msgstr ""
 
-#: ../../ui/composer.glade:47
-msgid "_Right"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
 msgstr ""
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:31
-msgid "_Save"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1395
-msgid "_Save As..."
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1414
-msgid "_Save Image As..."
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
 msgstr ""
 
-#: ../../ui/composer.glade:594
-msgid "_Send"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
 msgstr ""
 
-#: ../../ui/composer.glade:163
-msgid "_Small"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:289
-msgid "_Star"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
 msgstr ""
 
-#: ../../ui/composer.glade:7
-msgid "_Undo"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
 msgstr ""
 
-#: ../../ui/login.glade:522
-msgid "_Username:"
-msgstr ""
+#~ msgid "%u conversations selected."
+#~ msgstr "%u konversacioj elektitaj."
 
-#: ../../src/client/views/conversation-viewer.vala:1494
-msgid "_View Source"
-msgstr ""
+#~ msgid "Compose Message"
+#~ msgstr "Verki mesaĝon"
 
-#. / 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 ""
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Ĉu vi volas forigi la nekonservitan dosieron?"
 
-#: ../../src/client/views/conversation-viewer.vala:1148
-msgid "but actually goes to"
-msgstr ""
+#~ msgid "Geary Mail"
+#~ msgstr "Geary Mail"
 
-#: ../../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr ""
+#~ msgid "Large"
+#~ msgstr "Granda"
 
-#. / Placeholder filename for attachments with no filename.
-#: ../../src/client/views/conversation-viewer.vala:1799
-#: ../../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr ""
+#~ msgid "Password:"
+#~ msgstr "Pasvorto:"
 
-#: ../../src/client/views/conversation-find-bar.vala:226
-msgid "not found"
-msgstr ""
+#~ msgid "Please enter your email password"
+#~ msgstr "Bonvole enigu vian retpoŝtan pasvorton"
 
-#. / 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 ""
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
+
+#~ msgid "Send and receive email"
+#~ msgstr "Sendi kaj ricevi retpoŝton"
+
+#~ msgid "Small"
+#~ msgstr "Malgranda"
+
+#~ msgid "To add them as attachments"
+#~ msgstr "Por aldoni ilin kiel kunsendaĵoj"
+
+#~ msgid "Unable to login to email server"
+#~ msgstr "Ne konekteblas al retpoŝta servilo"
+
+#~ msgid "_Delete"
+#~ msgstr "_Forigi"
+
+#~ msgid "_Password:"
+#~ msgstr "_Pasvorto:"
diff --git a/po/es.po b/po/es.po
index 7ca1304..3a3b7a3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,454 +15,431 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-06-23 05:12+0000\n"
-"PO-Revision-Date: 2015-06-23 10:57-0600\n"
-"Last-Translator: Adolfo Jayme Barrientos <fitojb ubuntu com>\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:01+0000\n"
+"Last-Translator: Adolfo Jayme <fitoschido gmail com>\n"
 "Language-Team: Español; Castellano <gnome-es-list gnome org>\n"
-"Language: es\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: Poedit 1.8.1\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Cliente de correo"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Correo Geary"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Envíe y reciba mensajes de correo electrónico"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "email;e-mail;correo electrónico;correo-e;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Redactar mensaje"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Enviar por correo electrónico"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Enviar archivos mediante Geary"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Guardar"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:56+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: es\n"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Añadir"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Borradores | Borrador | Drafts | Draft"
 
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "Direcciones adicionales para %s"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
+"Enviados | Correo enviado | Bandeja de salida | Sent | Sent Mail | Sent "
+"Email | Sent E-Mail"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Cuentas"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
+"Correo no deseado | Spam | Junk | Junk Mail | Junk Email | Junk E-Mail | "
+"Bulk Mail | Bulk Email | Bulk E-Mail"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Nombre Apellido"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Papelera | Eliminados | Trash | Rubbish | Rubbish Bin"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Welcome to Geary."
-msgstr "Bienvenido a Geary."
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr "Archivo | Archivos"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Enter your account information to get started."
-msgstr "Proporcione la información de su cuenta para empezar."
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Bandeja de entrada"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "2 weeks back"
-msgstr "hace 2 semanas"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Borradores"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "1 month back"
-msgstr "hace 1 mes"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Enviados"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "3 months back"
-msgstr "hace 3 meses"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Destacados"
 
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "6 months back"
-msgstr "hace 6 meses"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Importantes"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "1 year back"
-msgstr "hace 1 año"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Todos"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-msgid "2 years back"
-msgstr "hace 2 años"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Spam"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-msgid "4 years back"
-msgstr "hace 4 años"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Papelera"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "Everything"
-msgstr "Todo"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Bandeja de salida"
 
-#: ../src/client/accounts/add-edit-page.vala:280
-msgid "Edit"
-msgstr "Editar"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Buscar"
 
-#: ../src/client/accounts/add-edit-page.vala:282
-msgid "Preview"
-msgstr "Previsualizar"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Archivados"
 
-#: ../src/client/accounts/add-edit-page.vala:723
-msgid "Remem_ber passwords"
-msgstr "Recor_dar las contraseñas"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Ninguno"
 
-#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "Recor_dar la contraseña"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:764
-msgid "Unable to validate:\n"
-msgstr "No se puede validar:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:766
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Alias de cuenta no válido.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:769
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; Ya se había añadido la dirección de correo a Geary.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Correo Yahoo!"
 
-#: ../src/client/accounts/add-edit-page.vala:773
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; Error de conexión IMAP.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:776
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; Nombre de usuario o contraseña IMAP incorrectos.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Otro"
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; Error de conexión SMTP.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "adjunto"
 
-#: ../src/client/accounts/add-edit-page.vala:782
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; El nombre de usuario o contraseña SMTP incorrectos.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "cco"
 
-#: ../src/client/accounts/add-edit-page.vala:786
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Error de conexión.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "cuerpo"
 
-#: ../src/client/accounts/add-edit-page.vala:790
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Nombre de usuario o contraseña incorrectos.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "cc"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011–2015 Fundación Yorba"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "de"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Visite el sitio web de Yorba"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "asunto"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Iniciar Geary con la ventana principal oculta"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "para"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Salida de información de depuración"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "yo"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Registrar la monitorización de conversaciones"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(sin asunto)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Registrar la deserialización de red"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %-e de %b %Y a las %-l:%M %p"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Registrar la actividad de red"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "El %1$s, %2$s escribió:"
 
-#. / 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 "Registrar la cola de eventos IMAP"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s escribió:"
 
-#. / 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 "Registrar la serialización de red"
+#. / 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:234
+msgid "On %s:"
+msgstr "El %s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Registrar la actividad periódica"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Mensaje reenviado ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Registrar las consultas a la base de datos (genera muchos mensajes)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "De: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Registrar la normalización de carpetas"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Asunto: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Permitir la inspección de WebView"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Fecha: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Revocar todos los certificados de servidores con advertencias de TLS"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Para: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Mostrar la versión del programa"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Cc: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Usar %s para abrir una ventana nueva del editor"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "sin nombre"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Envíe comentarios, sugerencias y errores a:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Cliente de correo"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Falló al analizar las opciones de la línea de comandos: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "Copyright 2011–2015 Fundación Yorba"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Opción de la línea de comandos «%s» no reconocida\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Visite el sitio web de Yorba"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:61
 msgid "Delete conversation"
 msgstr "Eliminar conversación"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Eliminar conversación (Mayús+Supr)"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Eliminar conversaciones (Mayús+Supr)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:67
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Mover conversación a la papelera (Supr, Retroceso)"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:68
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "Mover conversaciones a la papelera (Supr, Retroceso)"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Archivar"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Archivar conversación (A)"
 
-#: ../src/client/application/geary-controller.vala:75
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Archivar conversaciones (A)"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Marcar como _spam"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Marcar como no _spam"
 
-#: ../src/client/application/geary-controller.vala:81
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Marcar conversación"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Marcar conversaciones"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Añadir etiqueta a la conversación"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Añadir etiqueta a las conversaciones"
 
-#: ../src/client/application/geary-controller.vala:85
-#: ../src/client/application/geary-controller.vala:436
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Mover conversación"
 
-#: ../src/client/application/geary-controller.vala:86
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Mover conversaciones"
 
-#: ../src/client/application/geary-controller.vala:373
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "_Cuentas"
 
-#: ../src/client/application/geary-controller.vala:378
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../src/client/application/geary-controller.vala:382
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "Ay_uda"
 
-#: ../src/client/application/geary-controller.vala:386
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Acerca de"
 
-#: ../src/client/application/geary-controller.vala:390
-msgid "_Donate"
-msgstr "_Donar"
-
-#: ../src/client/application/geary-controller.vala:394
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../src/client/application/geary-controller.vala:399
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Marcar como…"
 
-#: ../src/client/application/geary-controller.vala:405
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Marcar como _leído"
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Marcar como _no leído"
 
-#: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Destacar"
 
-#: ../src/client/application/geary-controller.vala:422
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "_No destacar"
 
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Añadir etiqueta"
 
-#: ../src/client/application/geary-controller.vala:433
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Etiquetar"
 
-#: ../src/client/application/geary-controller.vala:437
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../src/client/application/geary-controller.vala:441
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Redactar un mensaje nuevo (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:445
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Responder (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:450
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "R_esponder a todos"
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Responder a todos (Ctrl+Mayús+R, Mayús+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Reenviar (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:496
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr "Vaciar"
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr "Vaciar las carpetas Spam o Papelera"
 
-#: ../src/client/application/geary-controller.vala:501
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr "Vaciar _Spam…"
 
-#: ../src/client/application/geary-controller.vala:505
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr "Vaciar la _papelera…"
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:538
+#: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
 msgstr "Conmutar la barra de búsqueda"
 
-#: ../src/client/application/geary-controller.vala:752
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "No se pudo almacenar la excepción de seguridad para el servidor"
 
-#: ../src/client/application/geary-controller.vala:989
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Su configuración no es segura"
 
-#: ../src/client/application/geary-controller.vala:990
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -472,17 +449,17 @@ msgstr ""
 "otra persona podría leer su nombre de usuario y contraseña en la misma red. "
 "¿Está seguro de que quiere hacer esto?"
 
-#: ../src/client/application/geary-controller.vala:991
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "Co_ntinuar"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Error al enviar el mensaje"
 
-#: ../src/client/application/geary-controller.vala:1070
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -490,14 +467,12 @@ msgstr ""
 "Geary encontró un error al enviar un mensaje. Si el problema persiste, "
 "elimine manualmente el mensaje de la bandeja de salida."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Error al guardar los mensajes enviados"
 
-#: ../src/client/application/geary-controller.vala:1075
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -505,20 +480,15 @@ msgstr ""
 "Geary encontró un error al guardar un mensaje enviado en Enviados. El "
 "mensaje permanecerá en la Bandeja de salida hasta que lo elimine."
 
-#: ../src/client/application/geary-controller.vala:1144
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Etiquetas"
 
-#. 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:1156
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "No se pudo abrir la base de datos local para %s"
 
-#: ../src/client/application/geary-controller.vala:1157
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -542,21 +512,19 @@ msgstr ""
 "Reconstruir la base de datos destruirá todo el correo guardado de forma "
 "local y sus adjuntos. <b>El correo del servidor permanecerá intacto.</b>"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "_Reconstruir"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "_Salir"
 
-#: ../src/client/application/geary-controller.vala:1168
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "No se puede reconstruir la base de datos para «%s»"
 
-#: ../src/client/application/geary-controller.vala:1169
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -566,17 +534,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1191
-#: ../src/client/application/geary-controller.vala:1201
-#: ../src/client/application/geary-controller.vala:1212
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "No se puede abrir el buzón local para %s"
 
-#: ../src/client/application/geary-controller.vala:1192
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -594,7 +558,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1202
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -608,7 +572,7 @@ msgstr ""
 "\n"
 "Instale la última versión de Geary e inténtelo de nuevo."
 
-#: ../src/client/application/geary-controller.vala:1213
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -620,29 +584,31 @@ msgstr ""
 "\n"
 "Revise su conexión de red y reinicie Geary."
 
-#: ../src/client/application/geary-controller.vala:1721
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "Acerca de %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1724
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
 msgstr ""
 "Adolfo Jayme Barrientos <fitojb ubuntu com>, 2012–2015\n"
-"Daniel Mustieles <daniel mustieles gmail com>, 2015"
+"Daniel Mustieles <daniel mustieles gmail com>, 2015\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Adolfo Jayme https://launchpad.net/~fitojb\n";
+"  Félix Brezo https://launchpad.net/~febrezo";
 
-#: ../src/client/application/geary-controller.vala:1990
+#: ../src/client/application/geary-controller.vala:1976
 msgid "Undo move (Ctrl+Z)"
 msgstr "Deshacer mover (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2000
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "¿Está seguro de que quiere abrir «%s»?"
 
-#: ../src/client/application/geary-controller.vala:2001
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -650,298 +616,532 @@ msgstr ""
 "Los archivos adjuntos podrían causar daños a su sistema. Abra solo los "
 "archivos que provengan de fuentes fiables."
 
-#: ../src/client/application/geary-controller.vala:2002
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "No volver a _preguntarme"
 
-#: ../src/client/application/geary-controller.vala:2020
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Ya existe un archivo llamado «%s». ¿Quiere reemplazarlo?"
 
-#: ../src/client/application/geary-controller.vala:2022
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr "El archivo ya existe en «%s». Reemplazarlo sobrescribirá su contenido."
+msgstr ""
+"El archivo ya existe en «%s». Reemplazarlo sobrescribirá su contenido."
 
-#: ../src/client/application/geary-controller.vala:2025
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2323
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "¿Quiere cerrar los mensajes en borrador abiertos?"
 
-#: ../src/client/application/geary-controller.vala:2453
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr "¿Quiere eliminar todos los mensajes de la carpeta «%s»?"
 
-#: ../src/client/application/geary-controller.vala:2454
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr ""
 "Esto eliminará el mensaje de Geary y del servidor de correo electrónico."
 
-#: ../src/client/application/geary-controller.vala:2455
+#: ../src/client/application/geary-controller.vala:2441
 msgid "This cannot be undone."
 msgstr "Esto no se puede deshacer."
 
-#: ../src/client/application/geary-controller.vala:2456
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr "Vaciar %s"
 
-#: ../src/client/application/geary-controller.vala:2473
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 msgid "Error emptying %s"
 msgstr "Error al vaciar «%s»"
 
-#: ../src/client/application/geary-controller.vala:2503
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "¿Quiere eliminar permanentemente este mensaje?"
 msgstr[1] "¿Quiere eliminar permanentemente estos mensajes?"
 
-#: ../src/client/application/geary-controller.vala:2505
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../src/client/application/geary-controller.vala:2536
+#: ../src/client/application/geary-controller.vala:2522
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Deshacer archivado (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2551
+#: ../src/client/application/geary-controller.vala:2537
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Deshacer envío a la papelera (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2604
+#: ../src/client/application/geary-controller.vala:2590
 msgid "Undo (Ctrl+Z)"
 msgstr "Deshacer (Ctrl+Z)"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i coincidencia"
-msgstr[1] "%i coincidencias"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Iniciar Geary con la ventana principal oculta"
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i coincidencia (compactada)"
-msgstr[1] "%i coincidencias (compactadas)"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Salida de información de depuración"
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "no encontrado"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Registrar la monitorización de conversaciones"
 
-#: ../src/client/components/main-window.vala:430
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Registrar la deserialización de red"
 
-#: ../src/client/components/search-bar.vala:10
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Buscar"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Registrar la actividad de red"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:25
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Buscar palabras en todo el correo de la cuenta (Ctrl+S)"
+#. / 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 "Registrar la cola de eventos IMAP"
 
-#: ../src/client/components/search-bar.vala:118
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indexando la cuenta %s"
+#. / 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 "Registrar la serialización de red"
 
-#: ../src/client/components/search-bar.vala:129
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Buscar la cuenta %s"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Registrar la actividad periódica"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Enviando…"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Registrar las consultas a la base de datos (genera muchos mensajes)"
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_Aceptar"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Registrar la normalización de carpetas"
 
-#: ../src/client/components/stock.vala:19
-#: ../ui/edit_alternate_emails.glade.h:3 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Cancelar"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Permitir la inspección de WebView"
 
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Cerrar"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Revocar todos los certificados de servidores con advertencias de TLS"
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Descartar"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Mostrar la versión del programa"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Abrir"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Usar %s para abrir una ventana nueva del editor"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Imprimir…"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Envíe comentarios, sugerencias y errores a:"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Eliminar"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Falló al analizar las opciones de la línea de comandos: %s\n"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "Seleccionar _todo"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Opción de la línea de comandos «%s» no reconocida\n"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Mantener"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s: mensajes nuevos"
 
-#: ../src/client/composer/composer-widget.vala:73
-msgid "Saved"
-msgstr "Guardado"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d mensaje nuevo"
+msgstr[1] "%d mensajes nuevos"
 
-#: ../src/client/composer/composer-widget.vala:74
-msgid "Saving"
-msgstr "Guardando"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d mensaje nuevo en total"
+msgstr[1] "%s, %d mensajes nuevos en total"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "Error saving"
-msgstr "Error al guardar"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d mensaje nuevo más para %s)"
+msgstr[1] ""
+"%s\n"
+"(%d mensajes nuevos más para %s)"
 
-#: ../src/client/composer/composer-widget.vala:76
-msgid "Press Backspace to delete quote"
-msgstr "Pulse Retroceso para eliminar la cita"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Abrir"
 
-#: ../src/client/composer/composer-widget.vala:77
-msgid "New Message"
-msgstr "Mensaje nuevo"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Yo"
 
-#. A 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:138
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr "Conexión no confiable: %s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
+"No se pudo comprobar la identidad del servidor de correo %s en %s:%u."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
 msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
-"adjuntar|adjuntando|adjunta|anexo|anexar|archivo|archivos|fichero|ficheros|"
-"adjunto|adjuntos|"
+"Es posible que su nombre de usuario y contraseña se transmitan de manera "
+"insegura si selecciona «Confiar en este servidor» o «Confiar siempre en este "
+"servidor»."
 
-#: ../src/client/composer/composer-widget.vala:1102
-#: ../src/client/composer/composer-widget.vala:1106
-msgid "Do you want to discard this message?"
-msgstr "¿Quiere descartar este mensaje?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"Geary no accederá a este servidor si selecciona «No confiar en este "
+"servidor»."
 
-#: ../src/client/composer/composer-widget.vala:1262
-msgid "Send message with an empty subject and body?"
-msgstr "¿Quiere enviar el mensaje sin asunto ni cuerpo?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Geary no añadirá ni actualizará esta cuenta de correo electrónico."
 
-#: ../src/client/composer/composer-widget.vala:1264
-msgid "Send message with an empty subject?"
-msgstr "¿Quiere enviar el mensaje sin asunto?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"Geary dejará de acceder a esta cuenta si selecciona «No confiar en este "
+"servidor»."
 
-#: ../src/client/composer/composer-widget.vala:1266
-msgid "Send message with an empty body?"
-msgstr "¿Quiere enviar el mensaje sin cuerpo?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr "Geary se cerrará si no hay otras cuentas de correo abiertas."
 
-#: ../src/client/composer/composer-widget.vala:1268
-msgid "Send message without an attachment?"
-msgstr "¿Quiere enviar el mensaje sin el archivo adjunto?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Póngase en contacto con el administrador del sistema o el proveedor del "
+"servicio de correo electrónico si tiene dudas con respecto a estos problemas."
 
-#: ../src/client/composer/composer-widget.vala:1530
-msgid "Cannot add attachment"
-msgstr "No se puede adjuntar el archivo"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
+"El certificado del servidor no está firmado por una autoridad conocida"
 
-#: ../src/client/composer/composer-widget.vala:1541
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "No se pudo encontrar «%s»."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr ""
+"La identidad del servidor no coincide con la identidad en el certificado"
 
-#: ../src/client/composer/composer-widget.vala:1548
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "«%s» es una carpeta."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "El certificado del servidor ha caducado"
 
-#: ../src/client/composer/composer-widget.vala:1555
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "«%s» es un archivo vacío."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "No se ha activado el certificado del servidor"
 
-#: ../src/client/composer/composer-widget.vala:1569
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "No se pudo abrir «%s» para lectura."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "Se ha revocado el certificado del servidor y ya no es válido"
 
-#: ../src/client/composer/composer-widget.vala:1576
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "Ya se ha adjuntado «%s» para enviarlo."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "El certificado del servidor se considera no confiable"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1585
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr "Ocurrió un error al procesar el certificado del servidor"
 
-#: ../src/client/composer/composer-widget.vala:1645
-msgid "To: "
-msgstr "Para: "
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr "Geary necesita la contraseña de su cuenta de correo para continuar"
 
-#: ../src/client/composer/composer-widget.vala:1648
-msgid "Cc: "
-msgstr "Cc: "
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Elija un archivo"
 
-#: ../src/client/composer/composer-widget.vala:1651
-msgid "Bcc: "
-msgstr "Cco: "
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Adjuntar"
 
-#: ../src/client/composer/composer-widget.vala:1654
-msgid "Reply-To: "
-msgstr "Responder a:"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr "Direcciones adicionales para %s"
 
-#: ../src/client/composer/composer-widget.vala:1887
-msgid "Select Color"
-msgstr "Seleccionar color"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Cuentas"
 
-#. 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:2322
-#, c-format
-msgid "%1$s via %2$s"
-msgstr "%1$s mediante %2$s"
+#. / 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 "Nombre Apellido"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2364
-msgid "_From:"
-msgstr "_De:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Bienvenido a Geary."
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Yo"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Proporcione la información de su cuenta para empezar."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "hace 2 semanas"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "hace 1 mes"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "hace 3 meses"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "hace 6 meses"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "hace 1 año"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "hace 2 años"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "hace 4 años"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Todo"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "Editar"
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr "Previsualizar"
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "Recor_dar las contraseñas"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "Recor_dar la contraseña"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "No se puede validar:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Alias de cuenta no válido.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr ""
+"        &#8226; Ya se había añadido la dirección de correo a Geary.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Error de conexión IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Nombre de usuario o contraseña IMAP incorrectos.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Error de conexión SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr ""
+"        &#8226; El nombre de usuario o contraseña SMTP incorrectos.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Error de conexión.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Nombre de usuario o contraseña incorrectos.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Guardar"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Añadir"
+
+#. / 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 "%l:%M %P"
+
+#. / 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 de %B de %Y a las %-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 de %B de %Y a las %-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 de %B de %Y a las %-l:%M %P"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Ahora"
+
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "Hace %dm"
+msgstr[1] "Hace %dm"
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "Hace %dh"
+msgstr[1] "Hace %dh"
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Ayer"
+
+#. / 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
+msgid "%A"
+msgstr "%A"
+
+#: ../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/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d mensaje"
+msgstr[1] "%d mensajes"
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d sin leer"
+msgstr[1] "%d sin leer"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Bandejas de entrada"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Buscar la cuenta %s"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d resultado"
+msgstr[1] "%d resultados"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "No hay ninguna conversación seleccionada."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "%u conversación seleccionada."
@@ -996,40 +1196,36 @@ msgid "Date:"
 msgstr "Fecha:"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "%u mensaje leído"
 msgstr[1] "%u mensajes leídos"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr "Este mensaje se envió correctamente pero no se pudo guardar en %s."
 
-#. Add a menu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Copiar"
 
-#. Add a menu item for copying the address.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "Copiar dirección de _correo"
 
-#. Add a menu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Copiar en_lace"
 
-#. Select message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "Seleccionar _mensaje"
 
-#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Seleccionar _todo"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "_Inspeccionar"
@@ -1042,7 +1238,6 @@ msgstr "Parece que este enlace apunta a"
 msgid "but actually goes to"
 msgstr "pero en realidad apunta a"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
 msgstr " (¿No válido?)"
@@ -1065,12 +1260,10 @@ msgid_plural "Save All A_ttachments..."
 msgstr[0] "Guardar ad_junto…"
 msgstr[1] "Guardar todos los ad_juntos…"
 
-#. Reply to all on a message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#. Mark as read/unread.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "_Marcar como leído"
@@ -1083,1068 +1276,619 @@ msgstr "_Marcar como no leído"
 msgid "Mark Unread From _Here"
 msgstr "Marcar como no leído desde _aquí"
 
-#. Separator.
-#. View original message source.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "_Ver código fuente"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:378
-msgid "none"
-msgstr "sin nombre"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "Falló al abrir el editor de textos predeterminado."
 
 #: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s: inspector de conversaciones"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Elija un archivo"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Guardado"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Adjuntar"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Guardando"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
-msgid "Untrusted Connection: %s"
-msgstr "Conexión no confiable: %s"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Error al guardar"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
-msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr "No se pudo comprobar la identidad del servidor de correo %s en %s:%u."
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "Pulse Retroceso para eliminar la cita"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
-msgid ""
-"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-"your username and password to be transmitted insecurely."
-msgstr ""
-"Es posible que su nombre de usuario y contraseña se transmitan de manera "
-"insegura si selecciona «Confiar en este servidor» o «Confiar siempre en este "
-"servidor»."
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Mensaje nuevo"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-"server."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Geary no accederá a este servidor si selecciona «No confiar en este "
-"servidor»."
+"adjuntar|adjuntando|adjunta|anexo|anexar|archivo|archivos|fichero|ficheros|ad"
+"junto|adjuntos|"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
-msgid "Geary will not add or update this email account."
-msgstr "Geary no añadirá ni actualizará esta cuenta de correo electrónico."
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "¿Quiere descartar este mensaje?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-"this account."
-msgstr ""
-"Geary dejará de acceder a esta cuenta si selecciona «No confiar en este "
-"servidor»."
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "¿Quiere enviar el mensaje sin asunto ni cuerpo?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr "Geary se cerrará si no hay otras cuentas de correo abiertas."
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "¿Quiere enviar el mensaje sin asunto?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
-msgid ""
-"Contact your system administrator or email service provider if you have any "
-"question about these issues."
-msgstr ""
-"Póngase en contacto con el administrador del sistema o el proveedor del "
-"servicio de correo electrónico si tiene dudas con respecto a estos problemas."
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "¿Quiere enviar el mensaje sin cuerpo?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
-msgstr "El certificado del servidor no está firmado por una autoridad conocida"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "¿Quiere enviar el mensaje sin el archivo adjunto?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
-msgid "The server's identity does not match the identity in the certificate"
-msgstr ""
-"La identidad del servidor no coincide con la identidad en el certificado"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "No se puede adjuntar el archivo"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
-msgid "The server's certificate has expired"
-msgstr "El certificado del servidor ha caducado"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "No se pudo encontrar «%s»."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
-msgid "The server's certificate has not been activated"
-msgstr "No se ha activado el certificado del servidor"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "«%s» es una carpeta."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
-msgid "The server's certificate has been revoked and is now invalid"
-msgstr "Se ha revocado el certificado del servidor y ya no es válido"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "«%s» es un archivo vacío."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
-msgid "The server's certificate is considered insecure"
-msgstr "El certificado del servidor se considera no confiable"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "No se pudo abrir «%s» para lectura."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
-msgid "An error has occurred processing the server's certificate"
-msgstr "Ocurrió un error al procesar el certificado del servidor"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "Ya se ha adjuntado «%s» para enviarlo."
 
-#. 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 "Geary requires your email password to continue"
-msgstr "Geary necesita la contraseña de su cuenta de correo para continuar"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. 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 mensaje"
-msgstr[1] "%d mensajes"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Para: "
 
-#. / 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 sin leer"
-msgstr[1] "%d sin leer"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Cc: "
 
-#. / 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/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Cco: "
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Bandejas de entrada"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "Responder a: "
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d resultado"
-msgstr[1] "%d resultados"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Seleccionar color"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s: mensajes nuevos"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr "%1$s mediante %2$s"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d mensaje nuevo"
-msgstr[1] "%d mensajes nuevos"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_De:"
 
-#: ../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 mensaje nuevo en total"
-msgstr[1] "%s, %d mensajes nuevos en total"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 mensaje nuevo más para %s)"
-msgstr[1] ""
-"%s\n"
-"(%d mensajes nuevos más para %s)"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Enviando…"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Abrir"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i coincidencia"
+msgstr[1] "%i coincidencias"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i coincidencia (compactada)"
+msgstr[1] "%i coincidencias (compactadas)"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "no encontrado"
 
-#. / 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"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_Aceptar"
 
-#. / 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"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#. / 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"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Cerrar"
 
-#. / 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 de %B de %Y a las %-l:%M %P"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Descartar"
 
-#. / 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 de %B de %Y a las %-H:%M."
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Abrir"
 
-#. / 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 de %B de %Y a las %-l:%M %P"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Imprimir…"
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Ahora"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Eliminar"
 
-#: ../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "Hace %dm"
-msgstr[1] "Hace %dm"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Mantener"
 
-#: ../src/client/util/util-date.vala:171
-#, c-format
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "Hace %dh"
-msgstr[1] "Hace %dh"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Buscar palabras en todo el correo de la cuenta (Ctrl+S)"
 
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "Ayer"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Indexando la cuenta %s"
 
-#. / 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"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(sin asunto)"
+#~ msgid "Geary Mail"
+#~ msgstr "Correo Geary"
 
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "bytes"
+#~ msgid "Send and receive email"
+#~ msgstr "Envíe y reciba mensajes de correo electrónico"
 
-#: ../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "email;e-mail;correo electrónico;correo-e;"
 
-#: ../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#~ msgid "Compose Message"
+#~ msgstr "Redactar mensaje"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#~ msgid "Send by email"
+#~ msgstr "Enviar por correo electrónico"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#~ msgid "Send files using Geary"
+#~ msgstr "Enviar archivos mediante Geary"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#~ msgid "_Donate"
+#~ msgstr "_Donar"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Correo Yahoo!"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">No se puede eliminar la cuenta</span> "
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Hay una ventana de redacción abierta asociada a esta cuenta. Envíe o "
+#~ "descarte el mensaje e inténtelo de nuevo."
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Otro"
+#~ msgid "Add account"
+#~ msgstr "Añadir cuenta"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#~ msgid "Edit account"
+#~ msgstr "Editar cuenta"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#~ msgid "Remove account"
+#~ msgstr "Eliminar cuenta"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Bandeja de entrada"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Espere mientras Geary valida su cuenta"
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Borradores"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Conexión no confiable"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Enviados"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "Confiar _siempre en este servidor"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Destacados"
+#~ msgid "_Trust This Server"
+#~ msgstr "_Confiar en este servidor"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Importantes"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "_No confiar en este servidor"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Todos"
+#~ msgid "_Undo"
+#~ msgstr "_Deshacer"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Spam"
+#~ msgid "_Redo"
+#~ msgstr "_Rehacer"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Papelera"
+#~ msgid "Cu_t"
+#~ msgstr "Cor_tar"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Bandeja de salida"
+#~ msgid "_Paste"
+#~ msgstr "_Pegar"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Archivados"
+#~ msgid "_Left"
+#~ msgstr "_Izquierda"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-msgstr "Ninguno"
+#~ msgid "_Right"
+#~ msgstr "_Derecha"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-msgid "attachment"
-msgstr "adjunto"
+#~ msgid "_Center"
+#~ msgstr "_Centrado"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
-msgstr "cco"
+#~ msgid "_Justify"
+#~ msgstr "_Justificado"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
-msgstr "cuerpo"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Enlace (Ctr+L)"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "cc"
-msgstr "cc"
+#~ msgid "C_olor"
+#~ msgstr "C_olor"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
-msgstr "de"
+#~ msgid "More options"
+#~ msgstr "Más opciones"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-msgid "subject"
-msgstr "asunto"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Citar el texto  (Ctrl+])"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
-msgstr "para"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Eliminar cita del texto (Ctrl+[)"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
-msgstr "yo"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Quitar formato (Ctrl+Espacio)"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-msgid "Drafts | Draft"
-msgstr "Borradores | Borrador | Drafts | Draft"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Pegar con _formato"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr ""
-"Enviados | Correo enviado | Bandeja de salida | Sent | Sent Mail | Sent "
-"Email | Sent E-Mail"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Negrita (Ctrl+B)"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
-msgstr ""
-"Correo no deseado | Spam | Junk | Junk Mail | Junk Email | Junk E-Mail | "
-"Bulk Mail | Bulk Email | Bulk E-Mail"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Cursiva (Ctrl+I)"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Papelera | Eliminados | Trash | Rubbish | Rubbish Bin"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Subrayado (Ctrl+U)"
 
-#. List of folder names to match for Archive, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
-msgid "Archive | Archives"
-msgstr "Archivo | Archivos"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Tachado (Ctrl+K)"
 
-#. / 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:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %-e de %b %Y a las %-l:%M %p"
+#~ msgid "_Rich Text"
+#~ msgstr "Texto en_riquecido"
 
-#. / 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:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "El %1$s, %2$s escribió:"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Mostrar campos ampliados"
 
-#. / 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:228
-#, c-format
-msgid "%s wrote:"
-msgstr "%s escribió:"
+#~ msgctxt "Label"
+#~ msgid "Close and Save"
+#~ msgstr "Guardar y cerrar"
 
-#. / 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:234
-#, c-format
-msgid "On %s:"
-msgstr "El %s:"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "Guardar y cerrar"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Mensaje reenviado ----------"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "Guardar y cerrar"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "De: %s\n"
+#~ msgctxt "Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Descartar y cerrar"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Asunto: %s\n"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Descartar y cerrar"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "Fecha: %s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "Descartar y cerrar"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "Para: %s\n"
+#~ msgid "Lar_ge"
+#~ msgstr "_Grande"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Cc: %s\n"
+#~ msgid "Large"
+#~ msgstr "Grande"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">No se puede eliminar la cuenta</span> "
+#~ msgid "_Medium"
+#~ msgstr "_Mediano"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Hay una ventana de redacción abierta asociada a esta cuenta. Envíe o "
-"descarte el mensaje e inténtelo de nuevo."
+#~ msgid "Medium"
+#~ msgstr "Mediano"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Añadir cuenta"
+#~ msgid "_Small"
+#~ msgstr "_Pequeño"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Editar cuenta"
+#~ msgid "Small"
+#~ msgstr "Pequeño"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Eliminar cuenta"
+#~ msgid "S_ans Serif"
+#~ msgstr "S_ans serif"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Espere mientras Geary valida su cuenta"
+#~ msgid "Sans Serif"
+#~ msgstr "Sans serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Conexión no confiable"
+#~ msgid "S_erif"
+#~ msgstr "S_erif"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "Confiar _siempre en este servidor"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "_Confiar en este servidor"
+#~ msgid "_Fixed Width"
+#~ msgstr "_Anchura fija"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "_No confiar en este servidor"
+#~ msgid "Fixed Width"
+#~ msgstr "Anchura fija"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Deshacer"
-
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Rehacer"
-
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "Cor_tar"
-
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "_Pegar"
-
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Izquierda"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Derecha"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Centrado"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Justificado"
-
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Enlace (Ctr+L)"
-
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "C_olor"
-
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Más opciones"
-
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Citar el texto  (Ctrl+])"
-
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Eliminar cita del texto (Ctrl+[)"
-
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Quitar formato (Ctrl+Espacio)"
-
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Pegar con _formato"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Negrita (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Cursiva (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Subrayado (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Tachado (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "Texto en_riquecido"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Mostrar campos ampliados"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "Guardar y cerrar"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "Guardar y cerrar"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "Guardar y cerrar"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "Descartar y cerrar"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "Descartar y cerrar"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "Descartar y cerrar"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "_Grande"
-
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "Grande"
-
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "_Mediano"
-
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "Mediano"
-
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "_Pequeño"
-
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "Pequeño"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "S_ans serif"
-
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "Sans serif"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "S_erif"
-
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "Serif"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "_Anchura fija"
-
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "Anchura fija"
-
-#: ../ui/composer.glade.h:42
-msgid "Detach"
-msgstr "Desacoplar"
-
-#: ../ui/composer.glade.h:43
-msgid "Detach (Ctrl+D)"
-msgstr "Desacoplar (Ctrl+D)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_Enviar"
-
-#: ../ui/composer.glade.h:45
-msgid "Send"
-msgstr "Enviar"
-
-#: ../ui/composer.glade.h:46
-msgid "Send (Ctrl+Enter)"
-msgstr "Enviar (Ctrl+Intro)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "_Adjuntar archivo"
-
-#: ../ui/composer.glade.h:48
-msgid "Attach File"
-msgstr "Adjuntar archivo"
-
-#: ../ui/composer.glade.h:49
-msgid "_Include Original Attachments"
-msgstr "_Incluir adjuntos originales"
-
-#: ../ui/composer.glade.h:50
-msgid "Include Original Attachments"
-msgstr "Incluir adjuntos originales"
-
-#: ../ui/composer.glade.h:51
-msgid "Application Menu"
-msgstr "Menú de aplicación"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:53
-msgid "_To"
-msgstr "_Para"
+#~ msgid "Detach"
+#~ msgstr "Desacoplar"
 
-#: ../ui/composer.glade.h:54
-msgid "_Cc"
-msgstr "_Cc"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Desacoplar (Ctrl+D)"
 
-#: ../ui/composer.glade.h:55
-msgid "_Subject"
-msgstr "A_sunto"
+#~ msgid "_Send"
+#~ msgstr "_Enviar"
 
-#: ../ui/composer.glade.h:56
-msgid "_Bcc"
-msgstr "Cc_o"
+#~ msgid "Send"
+#~ msgstr "Enviar"
 
-#: ../ui/composer.glade.h:57
-msgid "_Reply-To"
-msgstr "_Responder a:"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Enviar (Ctrl+Intro)"
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:59
-msgid "From"
-msgstr "De"
+#~ msgid "_Attach File"
+#~ msgstr "_Adjuntar archivo"
 
-#: ../ui/composer.glade.h:60
-msgid "Drop files here"
-msgstr "Suelte los archivos aquí"
+#~ msgid "Attach File"
+#~ msgstr "Adjuntar archivo"
 
-#: ../ui/composer.glade.h:61
-msgid "To add them as attachments"
-msgstr "Para añadirlos como adjuntos"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Incluir adjuntos originales"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-msgid "Remove email address"
-msgstr "Eliminar dirección de correo-e"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Incluir adjuntos originales"
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"Algunos servicios de correo necesitan que se configuren direcciones de "
-"correo adicionales en el servidor. Consulte con su proveedor de correo para "
-"obtener más información."
+#~ msgid "Application Menu"
+#~ msgstr "Menú de aplicación"
 
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "_Actualizar"
+#~ msgid "_To"
+#~ msgstr "_Para"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Buscar:"
+#~ msgid "_Cc"
+#~ msgstr "_Cc"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Anterior"
+#~ msgid "_Subject"
+#~ msgstr "A_sunto"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Siguiente"
+#~ msgid "_Bcc"
+#~ msgstr "Cc_o"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Distinguir mayúsculas y minúsculas"
+#~ msgid "_Reply-To"
+#~ msgstr "_Responder a:"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "etiqueta"
+#~ msgid "From"
+#~ msgstr "De"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Contraseña"
+#~ msgid "Drop files here"
+#~ msgstr "Suelte los archivos aquí"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "_Dirección de correo electrónico"
+#~ msgid "To add them as attachments"
+#~ msgstr "Para añadirlos como adjuntos"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Contraseña"
+#~ msgid "Remove email address"
+#~ msgstr "Eliminar dirección de correo-e"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "S_ervicio"
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "Algunos servicios de correo necesitan que se configuren direcciones de "
+#~ "correo adicionales en el servidor. Consulte con su proveedor de correo para "
+#~ "obtener más información."
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "N_ombre"
+#~ msgid "_Update"
+#~ msgstr "_Actualizar"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "_Apodo"
+#~ msgid "Find:"
+#~ msgstr "Buscar:"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Trabajo, casa, etc."
+#~ msgid "_Previous"
+#~ msgstr "_Anterior"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_Guardar mensajes enviados"
+#~ msgid "_Next"
+#~ msgstr "_Siguiente"
 
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
-msgstr "Direcciones de correo-e adicionales…"
+#~ msgid "_Case sensitive"
+#~ msgstr "_Distinguir mayúsculas y minúsculas"
 
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "Configuración IMAP"
+#~ msgid "label"
+#~ msgstr "etiqueta"
 
-#: ../ui/login.glade.h:12
-msgid "Se_rver"
-msgstr "Se_rvidor"
+#~ msgid "Password"
+#~ msgstr "Contraseña"
 
-#: ../ui/login.glade.h:13
-msgid "P_ort"
-msgstr "P_uerto"
+#~ msgid "E_mail address"
+#~ msgstr "_Dirección de correo electrónico"
 
-#: ../ui/login.glade.h:14
-msgid "Ser_ver"
-msgstr "Ser_vidor"
+#~ msgid "_Password"
+#~ msgstr "_Contraseña"
 
-#: ../ui/login.glade.h:15
-msgid "Por_t"
-msgstr "Pue_rto"
+#~ msgid "S_ervice"
+#~ msgstr "S_ervicio"
 
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "Configuración de SMTP"
+#~ msgid "N_ame"
+#~ msgstr "N_ombre"
 
-#: ../ui/login.glade.h:17
-msgid "User_name"
-msgstr "_Nombre de usuario"
+#~ msgid "N_ickname"
+#~ msgstr "_Apodo"
 
-#: ../ui/login.glade.h:18
-msgid "Pass_word"
-msgstr "_Contraseña"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Trabajo, casa, etc."
 
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr "Nombre de usuario de SMTP"
+#~ msgid "_Save sent mail"
+#~ msgstr "_Guardar mensajes enviados"
 
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr "Contraseña de SMTP"
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "Direcciones de correo-e adicionales…"
 
-#: ../ui/login.glade.h:21
-msgid "_Username"
-msgstr "Nombre de _usuario"
+#~ msgid "IMAP settings"
+#~ msgstr "Configuración IMAP"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr "Nombre de usuario de IMAP"
+#~ msgid "Se_rver"
+#~ msgstr "Se_rvidor"
 
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr "Contraseña de IMAP"
+#~ msgid "P_ort"
+#~ msgstr "P_uerto"
 
-#: ../ui/login.glade.h:24
-msgid "Encr_yption"
-msgstr "Ci_frado"
+#~ msgid "Ser_ver"
+#~ msgstr "Ser_vidor"
 
-#: ../ui/login.glade.h:25
-msgid "Encrypt_ion"
-msgstr "Cifra_do"
+#~ msgid "Por_t"
+#~ msgstr "Pue_rto"
 
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "SMTP settings"
+#~ msgstr "Configuración de SMTP"
 
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "User_name"
+#~ msgstr "_Nombre de usuario"
 
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "No se _requiere autenticación"
+#~ msgid "Pass_word"
+#~ msgstr "_Contraseña"
 
-#: ../ui/login.glade.h:30
-msgid "Use IMAP cre_dentials"
-msgstr "Utilizar cre_denciales IMAP"
+#~ msgid "SMTP username"
+#~ msgstr "Nombre de usuario de SMTP"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Redactor"
+#~ msgid "SMTP password"
+#~ msgstr "Contraseña de SMTP"
 
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr "Guardar _borradores en el servidor"
+#~ msgid "_Username"
+#~ msgstr "Nombre de _usuario"
 
-#: ../ui/login.glade.h:33
-msgid "Si_gn emails (HTML allowed):"
-msgstr "_Firmar los mensajes (HTML permitido):"
+#~ msgid "IMAP username"
+#~ msgstr "Nombre de usuario de IMAP"
 
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "Almacenamiento"
+#~ msgid "IMAP password"
+#~ msgstr "Contraseña de IMAP"
 
-#: ../ui/login.glade.h:35
-msgid "_Download mail"
-msgstr "_Descargar correo"
+#~ msgid "Encr_yption"
+#~ msgstr "Ci_frado"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "Credenciales SMTP"
+#~ msgid "Encrypt_ion"
+#~ msgstr "Cifra_do"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "Nombre de usuario"
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Recordar la contraseña"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Autenticar"
+#~ msgid "No authentication re_quired"
+#~ msgstr "No se _requiere autenticación"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Lectura"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Utilizar cre_denciales IMAP"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "Seleccionar el siguiente mensaje _automáticamente"
+#~ msgid "Composer"
+#~ msgstr "Redactor"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "_Mostrar la vista previa de la conversación"
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Guardar _borradores en el servidor"
 
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr "Usar vista de _tres paneles"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "_Firmar los mensajes (HTML permitido):"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "Activar corrección _ortográfica"
+#~ msgid "Storage"
+#~ msgstr "Almacenamiento"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "Notificaciones"
+#~ msgid "_Download mail"
+#~ msgstr "_Descargar correo"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "_Reproducir un sonido para las notificaciones"
+#~ msgid "SMTP Credentials"
+#~ msgstr "Credenciales SMTP"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "Mostrar _notificaciones cuando llegue correo nuevo"
+#~ msgid "Username"
+#~ msgstr "Nombre de usuario"
 
-#: ../ui/preferences.glade.h:10
-msgid "Always _watch for new mail"
-msgstr "_Revisar siempre si hay mensajes nuevos"
+#~ msgid "_Remember password"
+#~ msgstr "_Recordar la contraseña"
 
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr "Geary se ejecutará en segundo plano y le notificará de mensajes nuevos"
+#~ msgid "_Authenticate"
+#~ msgstr "_Autenticar"
 
-#: ../ui/preferences.glade.h:12
-msgid "Preferences"
-msgstr "Preferencias"
+#~ msgid "Reading"
+#~ msgstr "Lectura"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">¿Está seguro de que quiere eliminar "
-"esta cuenta?</span> "
+#~ msgid "_Automatically select next message"
+#~ msgstr "Seleccionar el siguiente mensaje _automáticamente"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Todos los correos electrónicos asociados con esta cuenta se eliminarán del "
-"equipo. Esto no afectará los correos en el servidor."
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Mostrar la vista previa de la conversación"
+
+#~ msgid "Use _three pane view"
+#~ msgstr "Usar vista de _tres paneles"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Activar corrección _ortográfica"
+
+#~ msgid "Notifications"
+#~ msgstr "Notificaciones"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Reproducir un sonido para las notificaciones"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Mostrar _notificaciones cuando llegue correo nuevo"
+
+#~ msgid "Always _watch for new mail"
+#~ msgstr "_Revisar siempre si hay mensajes nuevos"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr ""
+#~ "Geary se ejecutará en segundo plano y le notificará de mensajes nuevos"
+
+#~ msgid "Preferences"
+#~ msgstr "Preferencias"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">¿Está seguro de que quiere eliminar "
+#~ "esta cuenta?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Todos los correos electrónicos asociados con esta cuenta se eliminarán del "
+#~ "equipo. Esto no afectará los correos en el servidor."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Apodo:"
+#~ msgid "Nickname:"
+#~ msgstr "Apodo:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Dirección de correo:"
+#~ msgid "Email address:"
+#~ msgstr "Dirección de correo:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Actualización de Geary en proceso…"
+#~ msgid "Geary update in progress…"
+#~ msgstr "Actualización de Geary en proceso…"
diff --git a/po/et.po b/po/et.po
index 25703d5..9196fcd 100644
--- a/po/et.po
+++ b/po/et.po
@@ -10,1507 +10,1629 @@ 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-20 19:28+0000\n"
-"Last-Translator: yorbajim <jim yorba org>\n"
-"Language-Team: Estonian (http://www.transifex.com/projects/p/geary/language/";
-"et/)\n"
-"Language: et\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:02+0000\n"
+"Last-Translator: Jim Nelson <jim yorba org>\n"
+"Language-Team: Estonian "
+"(http://www.transifex.com/projects/p/geary/language/et/)\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"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:54+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: et\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:641
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Võrguühendus puudub\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:624
-msgid "        &#8226; Email address already added to Geary.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:628
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; Viga IMAP-i ühendamisel\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:631
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; IMAP-i konto nimi või parool on vale\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:621
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Vigane konto kuvatav nimi\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:634
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; Viga SMTP-i ühendamisel\n"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Postkast"
 
-#: ../../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; SMTP konto nimi või parool on vale\n"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Mustandid"
 
-#: ../../src/client/accounts/add-edit-page.vala:645
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Konto nimi või parool vale\n"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Saadetud"
 
-#: ../../src/client/views/conversation-viewer.vala:1203
-msgid " (Invalid?)"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Lemmikud"
 
-#: ../../src/client/composer/composer-window.vala:972
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "Fail \"%s\" on juba manuste nimekirjas."
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Tähtsad"
 
-#: ../../src/client/composer/composer-window.vala:937
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "Faili \"%s\" ei leitud."
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Kõik"
 
-#: ../../src/client/composer/composer-window.vala:965
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "Kirja \"%s\" avamine ebaõnnestus."
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Rämpspost"
 
-#: ../../src/client/composer/composer-window.vala:944
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" on kaust."
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Prügi"
 
-#: ../../src/client/composer/composer-window.vala:951
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" on tühi fail."
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Saadetud"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
 msgstr ""
 
-#. / 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 "%A, %e. %B, %Y - %-H:%M"
-
-#. / 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 "%A, %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 "%A, %e. %B, %Y - %-H:%M"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Puudub"
 
-#. / 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 - %-H:%M"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr ""
 
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] ""
-msgstr[1] ""
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d uus kiri"
-msgstr[1] "%d uut kirja"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:43
-#, c-format
-msgid "%d results"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
 msgstr ""
 
-#. / 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] ""
-msgstr[1] ""
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Mõni teine..."
 
-#: ../../src/client/util/util-date.vala:170
-#, c-format
-msgid "%dh ago"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
 msgstr ""
 
-#: ../../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
 msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:222
-#, c-format
-msgid "%i matches"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
 msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:224
-#, c-format
-msgid "%i matches (wrapped)"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
 msgstr ""
 
-#. / 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 "%H:%M"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr ""
 
-#. / 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"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:107
-#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
-msgstr[1] ""
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr ""
 
-#. / 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)"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
 msgstr ""
 
-#: ../../src/client/views/conversation-web-view.vala:289
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - Kirja ülevaataja"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(teema puudub)"
 
-#: ../../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - uued kirjad"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%A, %e. %B, %Y - %-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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr ""
 
 #. / 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
+#: ../src/engine/rfc822/rfc822-utils.vala:228
 msgid "%s wrote:"
 msgstr "%s kirjutas:"
 
-#: ../../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] ""
-msgstr[1] ""
-
-#. / 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"
+#. / 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:234
+msgid "On %s:"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:246
-#, c-format
-msgid "%u conversations selected."
-msgstr "%u kirja valitud."
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Edasisuunatud kiri ----------"
 
-#: ../../src/client/views/conversation-viewer.vala:743
-#, c-format
-msgid "%u read messages"
-msgstr "%u loetud kirja"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Kellelt: %s\n"
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Teema: %s\n"
 
-#: ../../src/client/util/util-email.vala:30
-msgid "(no subject)"
-msgstr "(teema puudub)"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Kuupäev: %s\n"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Edasisuunatud kiri ----------"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Saaja: %s\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:211
-msgid "1 month back"
-msgstr "1 kuu vältel"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:214
-msgid "1 year back"
-msgstr "1 aasta vältel"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "puudub"
 
-#: ../../src/client/accounts/add-edit-page.vala:210
-msgid "2 weeks back"
-msgstr "2 nädala vältel"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Meili klient"
 
-#: ../../src/client/accounts/add-edit-page.vala:212
-msgid "3 months back"
-msgstr "3 kuu vältel"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:213
-msgid "6 months back"
-msgstr "6 kuu vältel"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Ava Yorba lehekülg"
 
-#: ../../ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr "Oled sa kindel, et soovid selle konto eemaldada?"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
-#: ../../ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#: ../src/client/application/geary-controller.vala:62
+msgid "Delete conversation (Shift+Delete)"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Konto eemaldamine ebaõnnestus</span> "
 
-#: ../../ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/application/geary-controller.vala:63
+msgid "Delete conversations (Shift+Delete)"
 msgstr ""
-"Uue kirja koostamise aken on juba avatud. Saada sõnum ära või sulge see "
-"aken, seejärel proovi uuesti."
 
-#: ../../src/client/geary-controller.vala:1491
-#, c-format
-msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr "Fail nimega \"%s\" on juba olemas. Soovid sa selle asendada?"
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:245
-msgid "A_ccounts"
-msgstr "_Kontod"
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:1227
-#, c-format
-msgid "About %s"
-msgstr "%s teave"
+#: ../src/client/application/geary-controller.vala:72
+msgid "_Archive"
+msgstr "_Arhiveeri"
 
-#: ../../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Kontod"
+#: ../src/client/application/geary-controller.vala:73
+msgid "Archive conversation (A)"
+msgstr ""
 
-#: ../../ui/account_list.glade:71
-msgid "Add account"
+#: ../src/client/application/geary-controller.vala:74
+msgid "Archive conversations (A)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:304
-msgid "Add label"
+#: ../src/client/application/geary-controller.vala:77
+msgid "Mark as S_pam"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:78
+msgid "Mark as not S_pam"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
+msgid "Mark conversation"
+msgstr "Märgi kui..."
+
+#: ../src/client/application/geary-controller.vala:81
+msgid "Mark conversations"
+msgstr "Märgi kui..."
+
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Sildista kui..."
 
-#: ../../src/client/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Sildista kui..."
 
-#: ../../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Kõik"
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
+msgid "Move conversation"
+msgstr "Liiguta asukohta..."
 
-#: ../../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 ""
-"Kõik selle konto Geary eelistused kustutatakse, kuid serveri eelistused, "
-"andmed ning kirjad säilitatakse."
+#: ../src/client/application/geary-controller.vala:85
+msgid "Move conversations"
+msgstr "Liiguta asukohta..."
 
-#: ../../src/client/geary-args.vala:24
-msgid "Allow inspection of WebView"
-msgstr "Veebivaate ülevaatuse lubamine"
+#: ../src/client/application/geary-controller.vala:372
+msgid "A_ccounts"
+msgstr "_Kontod"
 
-#: ../../src/client/views/conversation-viewer.vala:509
-msgid "Always Show From Sender"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:377
+#: ../src/client/components/stock.vala:27
+msgid "_Preferences"
+msgstr "_Eelistused"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/components/stock.vala:25
+msgid "_Help"
+msgstr "_Abi..."
 
-#: ../../src/client/geary-controller.vala:48
-msgid "Archive conversation (Delete, Backspace, A)"
-msgstr "Arhiveeri kiri (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:385
+#: ../src/client/components/stock.vala:21
+msgid "_About"
+msgstr "_Programmist lähemalt..."
 
-#: ../../src/client/geary-controller.vala:49
-msgid "Archive conversations (Delete, Backspace, A)"
-msgstr "Arhiveeri kirjad (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:389
+#: ../src/client/components/stock.vala:29
+msgid "_Quit"
+msgstr "_Välju"
 
-#: ../../src/client/geary-controller.vala:1477
-#, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr "Oled sa kindel, et soovid avada kirja \"%s\"?"
+#: ../src/client/application/geary-controller.vala:394
+msgid "_Mark as..."
+msgstr "_Märgi kui..."
 
-#: ../../src/client/geary-controller.vala:1478
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
+#: ../src/client/application/geary-controller.vala:400
+msgid "Mark as _Read"
 msgstr ""
-"Manused võivad sisaldada süsteemi kahjustavaid faile. Ava ainult "
-"usaldusväärseid manuseid."
-
-#: ../../src/client/views/conversation-viewer.vala:614
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: ../../ui/composer.glade:113
-msgid "Bold (Ctrl+B)"
-msgstr "Rasvane (Ctrl+B)"
 
-#: ../../ui/composer.glade:69
-msgid "C_olor"
-msgstr "_Värv"
+#: ../src/client/application/geary-controller.vala:406
+msgid "Mark as _Unread"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:926
-msgid "Cannot add attachment"
-msgstr "Manuse lisamine ebaõnnestus"
+#: ../src/client/application/geary-controller.vala:412
+msgid "_Star"
+msgstr "_Lemmik"
 
-#: ../../src/client/views/conversation-viewer.vala:611
-msgid "Cc:"
-msgstr "Cc:"
+#: ../src/client/application/geary-controller.vala:417
+msgid "U_nstar"
+msgstr "Eemalda _lemmikutest"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
+#: ../src/client/application/geary-controller.vala:427
+msgid "Add label"
 msgstr ""
 
-#: ../../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Manuse valimine"
-
-#: ../../src/client/geary-controller.vala:553
-msgid "Co_ntinue"
-msgstr "Co_ntinue"
+#: ../src/client/application/geary-controller.vala:428
+msgid "_Label"
+msgstr "_Silt"
 
-#: ../../src/client/geary-application.vala:29
-msgid "Compose Message"
-msgstr "Koosta uus kiri"
+#: ../src/client/application/geary-controller.vala:432
+msgid "_Move"
+msgstr "_Liiguta asukohta"
 
-#: ../../src/client/geary-controller.vala:313
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr ""
 
-#: ../../ui/preferences.glade:117
-msgid "Composer"
-msgstr "Redigeerimine:"
-
-#: ../../src/client/views/conversation-viewer.vala:897
-msgid "Copy _Email Address"
-msgstr "Kopeeri _emaili aadress"
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
+msgid "_Reply"
+msgstr "_Vasta..."
 
-#: ../../src/client/views/conversation-viewer.vala:902
-msgid "Copy _Link"
-msgstr "Kopeeri _lingi aadress"
+#: ../src/client/application/geary-controller.vala:441
+msgid "Reply (Ctrl+R, R)"
+msgstr ""
 
-#: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr "Autoriõigused 2011-2013 Yorba Foundation"
+#: ../src/client/application/geary-controller.vala:445
+msgid "R_eply All"
+msgstr ""
 
-#: ../../ui/composer.glade:21
-msgid "Cu_t"
+#: ../src/client/application/geary-controller.vala:446
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:620
-msgid "Date:"
-msgstr "Kuupäev:"
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
+msgid "_Forward"
+msgstr "_Suuna edasi..."
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "Kuupäev: %s\n"
+#: ../src/client/application/geary-controller.vala:452
+msgid "Forward (Ctrl+L, F)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:43
-msgid "Delete conversation (Delete, Backspace, A)"
-msgstr "Kustuta kiri (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:44
-msgid "Delete conversations (Delete, Backspace, A)"
-msgstr "Kustuta kirjad (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:25
-msgid "Display program version"
-msgstr "Kuva rakenduse versioon"
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:663
-msgid "Do you want to discard the unsaved message?"
-msgstr "Oled sa kindel, et ei soovi kirja saata?"
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:666
-msgid "Do you want to discard this message?"
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1479
-msgid "Don't _ask me again"
-msgstr "Ära _küsi uuesti"
+#: ../src/client/application/geary-controller.vala:746
+msgid "Unable to store server trust exception"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Mustandid"
+#: ../src/client/application/geary-controller.vala:983
+msgid "Your settings are insecure"
+msgstr "Sinu eelistused on ebaturvalised"
+
+#: ../src/client/application/geary-controller.vala:984
+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 ""
+"Sinu IMAP-i ja/või SMTP eelistused ei täpsusta SSL-i või TLS-i. See "
+"tähendab, et sinu konto nimi ja parool pole kaitstud ning sinu võrgus olevad "
+"teised isikud võivad neid näha. Oled sa kindel, et soovid seda teha?"
 
-#: ../../ui/composer.glade:419
-msgid "Drop files here"
-msgstr "Tiri failid siia"
+#: ../src/client/application/geary-controller.vala:985
+msgid "Co_ntinue"
+msgstr "Co_ntinue"
 
-#: ../../ui/login.glade:115
-msgid "E_mail address:"
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/components/status-bar.vala:29
+msgid "Error sending email"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:704
-msgid "E_xit"
+#: ../src/client/application/geary-controller.vala:1064
+msgid ""
+"Geary encountered an error sending an email.  If the problem persists, "
+"please manually delete the email from your Outbox folder."
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:533
-msgid "Edit Draft"
+#: ../src/client/application/geary-controller.vala:1068
+#: ../src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
 msgstr ""
 
-#: ../../ui/account_list.glade:84
-msgid "Edit account"
+#: ../src/client/application/geary-controller.vala:1069
+msgid ""
+"Geary encountered an error saving a sent message to Sent Mail.  The message "
+"will stay in your Outbox folder until you delete it."
 msgstr ""
 
-#: ../../ui/remove_confirm.glade:94
-msgid "Email address:"
-msgstr "Emaili aadress:"
+#: ../src/client/application/geary-controller.vala:1138
+msgid "Labels"
+msgstr "Sildid"
 
-#: ../../src/client/geary-application.vala:28
-msgid "Email;E-mail;Mail;"
+#: ../src/client/application/geary-controller.vala:1150
+msgid "Unable to open the database for %s"
 msgstr ""
 
-#: ../../ui/preferences.glade:131
-msgid "Enable _spell checking"
-msgstr "Õigekirja _kontrollimine"
+#: ../src/client/application/geary-controller.vala:1151
+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 ""
 
-#: ../../ui/login.glade:588
-msgid "Encr_yption:"
-msgstr "Krüp_teering:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "_Rebuild"
+msgstr ""
 
-#: ../../ui/login.glade:607
-msgid "Encrypt_ion:"
-msgstr "Krüp_teering:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "E_xit"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-msgid "Enter your account information to get started."
-msgstr "Alustuseks sisesta oma e-maili konto andmed"
+#: ../src/client/application/geary-controller.vala:1162
+msgid "Unable to rebuild database for \"%s\""
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:714
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:43
-msgid "Error saving"
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
+msgid "Unable to open local mailbox for %s"
 msgstr ""
 
-#. / 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"
+#: ../src/client/application/geary-controller.vala:1186
+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 ""
 
-#: ../../src/client/accounts/add-edit-page.vala:216
-msgid "Everything"
-msgstr "Kõik"
-
-#: ../../src/client/views/conversation-viewer.vala:1897
-msgid "Failed to open default text editor."
-msgstr "Vaikimisi tekstiredaktori avamine ebaõnnestus."
-
-#: ../../src/client/geary-args.vala:54
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Käsurea ridade eelistuste parsimine ebaõnnestus: %s\n"
+#: ../src/client/application/geary-controller.vala:1196
+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 ""
 
-#. / 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"
+#: ../src/client/application/geary-controller.vala:1207
+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 ""
 
-#: ../../ui/composer.glade:182
-msgid "Fixed Width"
+#: ../src/client/application/geary-controller.vala:1715
+msgid "About %s"
+msgstr "%s teave"
+
+#. / 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-controller.vala:1718
+msgid "translator-credits"
 msgstr ""
+"translator-credits\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Jim Nelson https://launchpad.net/~yorba-jim";
 
-#: ../../src/client/geary-controller.vala:329
-msgid "Forward (Ctrl+L, F)"
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:605
-msgid "From:"
-msgstr "Saatja:"
+#: ../src/client/application/geary-controller.vala:1986
+msgid "Are you sure you want to open \"%s\"?"
+msgstr "Oled sa kindel, et soovid avada kirja \"%s\"?"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "Kellelt: %s\n"
+#: ../src/client/application/geary-controller.vala:1987
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
+"Manused võivad sisaldada süsteemi kahjustavaid faile. Ava ainult "
+"usaldusväärseid manuseid."
 
-#: ../../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#: ../src/client/application/geary-controller.vala:1988
+msgid "Don't _ask me again"
+msgstr "Ära _küsi uuesti"
 
-#: ../../src/client/geary-application.vala:25
-msgid "Geary Mail"
-msgstr "Geary"
+#: ../src/client/application/geary-controller.vala:2006
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr "Fail nimega \"%s\" on juba olemas. Soovid sa selle asendada?"
 
-#: ../../src/client/geary-controller.vala:626
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
+"Sellenimeline fail on asukohas \"%s\" juba olemas. Selle asendamine kirjutab "
+"selle sisu üle."
+
+#: ../src/client/application/geary-controller.vala:2011
+msgid "_Replace"
+msgstr "_Asenda"
 
-#: ../../ui/password-dialog.glade:315
-msgid "General"
+#: ../src/client/application/geary-controller.vala:2309
+msgid "Close open draft messages?"
 msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:133
-msgid "IMAP Credentials"
-msgstr "IMAP-i andmed"
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
 
-#: ../../ui/login.glade:572
-msgid "IMAP password"
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
 msgstr ""
 
-#: ../../ui/login.glade:286 ../../ui/password-dialog.glade:334
-msgid "IMAP settings"
-msgstr "IMAP eelistused:"
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
 
-#: ../../ui/login.glade:556
-msgid "IMAP username"
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Tähtsad"
+#: ../src/client/application/geary-controller.vala:2489
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Postkast"
+#: ../src/client/application/geary-controller.vala:2491
+msgid "Delete"
+msgstr ""
 
-#: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Postkastid"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:163
-#, c-format
-msgid "Indexing %s account"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
 msgstr ""
 
-#: ../../ui/composer.glade:120
-msgid "Italic (Ctrl+I)"
-msgstr "Kursiiv (Ctrl+I)"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:689
-msgid "Labels"
-msgstr "Sildid"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Väljundi vigade analüüsimise teave"
 
-#: ../../ui/composer.glade:151
-msgid "Lar_ge"
-msgstr ""
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Kirjade jälgimise logimine"
 
-#: ../../ui/composer.glade:152
-msgid "Large"
-msgstr "Suur"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr ""
 
-#: ../../ui/composer.glade:62
-msgid "Link (Ctrl+L)"
-msgstr "Veebilink (Ctrl+L)"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Võrgu tegevuste logimine"
 
 #. / 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
+#: ../src/client/application/geary-args.vala:17
 msgid "Log IMAP replay queue"
 msgstr "IMAP-i esitusnimekirja logimine"
 
-#: ../../src/client/geary-args.vala:11
-msgid "Log conversation monitoring"
-msgstr "Kirjade jälgimise logimine"
+#. / 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 "Võrgu väljaande logimine"
 
-#: ../../src/client/geary-args.vala:21
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Tegevuste perioodiline logimine"
+
+#: ../src/client/application/geary-args.vala:22
 msgid "Log database queries (generates lots of messages)"
 msgstr "Andmebaaside nimekirjade logimine (loob palju kirju)"
 
 #. / "Normalization" can also be called "synchronization"
-#: ../../src/client/geary-args.vala:23
+#: ../src/client/application/geary-args.vala:24
 msgid "Log folder normalization"
 msgstr "Kausta sünkroniseerimise logimine"
 
-#: ../../src/client/geary-args.vala:13
-msgid "Log network activity"
-msgstr "Võrgu tegevuste logimine"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Veebivaate ülevaatuse lubamine"
 
-#: ../../src/client/geary-args.vala:12
-msgid "Log network deserialization"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
 msgstr ""
 
-#. / 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 "Võrgu väljaande logimine"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Kuva rakenduse versioon"
 
-#: ../../src/client/geary-args.vala:20
-msgid "Log periodic activity"
-msgstr "Tegevuste perioodiline logimine"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr ""
 
-#: ../../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Palun saada kommentaarid, soovitused ja veateated asukohta:"
 
-#: ../../src/client/geary-application.vala:26
-msgid "Mail Client"
-msgstr "Meili klient"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Käsurea ridade eelistuste parsimine ebaõnnestus: %s\n"
 
-#: ../../src/client/views/conversation-viewer.vala:1479
-msgid "Mark Unread From _Here"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Tundmatu käsurea rida eelistus \"%s\"\n"
+
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - uued kirjad"
+
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d uus kiri"
+msgstr[1] "%d uut kirja"
+
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Ava"
+
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Mina"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:52
-msgid "Mark as S_pam"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:277
-msgid "Mark as _Read"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:283
-msgid "Mark as _Unread"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:53
-msgid "Mark as not S_pam"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:55
-#: ../../src/client/geary-controller.vala:269
-msgid "Mark conversation"
-msgstr "Märgi kui..."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:56
-msgid "Mark conversations"
-msgstr "Märgi kui..."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
 
-#: ../../src/client/views/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Mina"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
 
-#: ../../ui/composer.glade:158
-msgid "Medium"
-msgstr "Keskmine"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
 
-#: ../../ui/composer.glade:75
-msgid "More options"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:59
-#: ../../src/client/geary-controller.vala:308
-msgid "Move conversation"
-msgstr "Liiguta asukohta..."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:60
-msgid "Move conversations"
-msgstr "Liiguta asukohta..."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr ""
 
-#: ../../ui/login.glade:176
-msgid "N_ame:"
-msgstr "_Nimi:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr ""
 
-#: ../../ui/login.glade:230
-msgid "N_ickname:"
-msgstr "_Konto nimi:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "Uus kiri"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:80
-msgid "Nickname:"
-msgstr "Konto nimi:"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr ""
 
-#: ../../ui/login.glade:661
-msgid "No authentication re_quired"
-msgstr "Autentimine pole _vajalik"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Manuse valimine"
 
-#: ../../src/client/views/conversation-viewer.vala:275
-msgid "No conversations in folder."
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Olgu"
+
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:244
-msgid "No conversations selected."
-msgstr "Kirjad puuduvad"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Kontod"
 
-#: ../../src/client/views/conversation-viewer.vala:273
-msgid "No search results found."
+#. / 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 ""
 
-#: ../../src/client/dialogs/password-dialog.vala:128
-#: ../../src/engine/api/geary-special-folder-type.vala:58
-msgid "None"
-msgstr "Puudub"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Teretulemast meiliklienti Geary"
 
-#: ../../ui/preferences.glade:158
-msgid "Notifications"
-msgstr "Teated:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Alustuseks sisesta oma e-maili konto andmed"
 
-#: ../../src/client/util/util-date.vala:164
-msgid "Now"
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 nädala vältel"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 kuu vältel"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 kuu vältel"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 kuu vältel"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 aasta vältel"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
 msgstr ""
 
-#. / 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:"
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
 msgstr ""
 
-#. / 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:"
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Kõik"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
 msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Ava"
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Mõni teine..."
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Saadetud"
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Valideerimine ebaõnnestus:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Vigane konto kuvatav nimi\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:10
-msgid "Output debugging information"
-msgstr "Väljundi vigade analüüsimise teave"
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Viga IMAP-i ühendamisel\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; IMAP-i konto nimi või parool on vale\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Viga SMTP-i ühendamisel\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; SMTP konto nimi või parool on vale\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Võrguühendus puudub\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Konto nimi või parool vale\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Salvesta"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Lisa"
+
+#. / 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 "%H:%M"
+
+#. / 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"
 
-#: ../../ui/login.glade:337
-msgid "P_ort:"
-msgstr "P_ort:"
+#. / 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"
 
-#: ../../ui/login.glade:474
-msgid "Pass_word:"
-msgstr "_Parool:"
+#. / 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 "%A, %e. %B, %Y - %-H:%M"
+
+#. / 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 "%A, %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 "%A, %e. %B, %Y - %-H:%M"
 
-#: ../../ui/login.glade:101
-msgid "Password"
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:196
-msgid "Password:"
-msgstr "Parool:"
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:102
-msgid "Paste _With Formatting"
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your email password"
-msgstr "Palun sisesta oma e-maili parool"
+#. / 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
+msgid "%A"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:47
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Palun saada kommentaarid, soovitused ja veateated asukohta:"
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "baiti"
 
-#: ../../ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
-msgstr "E-maili konto andmete kontrollimine"
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "TB"
 
-#: ../../ui/login.glade:421
-msgid "Por_t:"
-msgstr "Por_t:"
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "GB"
 
-#: ../../ui/password-dialog.glade:367 ../../ui/password-dialog.glade:470
-msgid "Port:"
-msgstr "Port:"
+#: ../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"
 
-#: ../../ui/composer.glade:81
-msgid "Quote text  (Ctrl+])"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] ""
+msgstr[1] ""
+
+#. / 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
+msgid "%s, %s"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:322
-msgid "R_eply All"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Postkastid"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
 msgstr ""
 
-#: ../../ui/preferences.glade:55
-msgid "Reading"
-msgstr "Lugemine:"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/password-dialog.glade:274
-msgid "Real name:"
-msgstr "Päris nimi:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "Kirjad puuduvad"
 
-#: ../../src/client/accounts/add-edit-page.vala:590
-msgid "Remem_ber password"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:583
-msgid "Remem_ber passwords"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
 msgstr ""
 
-#: ../../ui/account_list.glade:97
-msgid "Remove account"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
 msgstr ""
 
-#: ../../ui/composer.glade:95
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Eemalda vormindus (Ctrl+Space)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:318
-msgid "Reply (Ctrl+R, R)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:323
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1452
-msgid "Reply to _All"
-msgstr "Vasta _kõigile..."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "Saatja:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "Saaja:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Cc:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Bcc:"
 
-#: ../../ui/password-dialog.glade:163
-msgid "SMTP Credentials"
-msgstr "SMTP Credentials"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "Teema:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Kuupäev:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:507
-msgid "SMTP password"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
 msgstr ""
 
-#: ../../ui/login.glade:439 ../../ui/password-dialog.glade:437
-msgid "SMTP settings"
-msgstr "SMTP eelistused:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "_Kopeeri"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "Kopeeri _emaili aadress"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "Kopeeri _lingi aadress"
 
-#: ../../ui/login.glade:491
-msgid "SMTP username"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:124
-msgid "SSL"
-msgstr "SSL"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Vali _kõik"
 
-#: ../../ui/password-dialog.glade:382 ../../ui/password-dialog.glade:485
-msgid "SSL/TLS encryption:"
-msgstr "SSL/TLS krüpteering:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "_Inspekteeri"
 
-#: ../../src/client/dialogs/password-dialog.vala:126
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr ""
 
-#: ../../ui/composer.glade:169
-msgid "S_ans Serif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
 msgstr ""
 
-#: ../../ui/composer.glade:175
-msgid "S_erif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
 msgstr ""
 
-#: ../../ui/login.glade:160
-msgid "S_ervice:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
 msgstr ""
 
-#: ../../ui/composer.glade:170
-msgid "Sans Serif"
-msgstr "Sans Serif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_Salvesta kui..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "Save All A_ttachments..."
 
-#: ../../src/client/views/conversation-viewer.vala:1437
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
 msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] "Save A_ttachment..."
 msgstr[1] "Save All A_ttachments..."
 
-#: ../../src/client/views/conversation-viewer.vala:1400
-msgid "Save All A_ttachments..."
-msgstr "Save All A_ttachments..."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "Vasta _kõigile..."
 
-#: ../../src/client/composer/composer-window.vala:41
-msgid "Saved"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "_Loetud"
 
-#: ../../src/client/composer/composer-window.vala:42
-msgid "Saving"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "_Lugemata"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
 msgstr ""
 
-#: ../../ui/login.glade:304
-msgid "Se_rver:"
-msgstr "Se_rver:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "_Vaata allikat..."
 
-#: ../../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"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "Vaikimisi tekstiredaktori avamine ebaõnnestus."
+
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr "%s - Kirja ülevaataja"
+
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
 msgstr ""
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:39
-#: ../../src/client/ui/main-toolbar.vala:170
-#, c-format
-msgid "Search %s account"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
 msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:76
-msgid "Search all mail in account for keywords (Ctrl+S)"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:1243
-msgid "Select Color"
-msgstr "Fondi värvi valimine"
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr ""
 
-#: ../../src/client/ui/stock.vala:32
-#: ../../src/client/views/conversation-viewer.vala:916
-msgid "Select _All"
-msgstr "Vali _kõik"
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Uus kiri"
 
-#: ../../src/client/views/conversation-viewer.vala:910
-msgid "Select _Message"
+#: ../src/client/composer/composer-widget.vala:138
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:27
-msgid "Send and receive email"
-msgstr "Send and receive email"
-
-#: ../../src/client/composer/composer-window.vala:747
-msgid "Send message with an empty body?"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:743
+#: ../src/client/composer/composer-widget.vala:1262
 msgid "Send message with an empty subject and body?"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:745
+#: ../src/client/composer/composer-widget.vala:1264
 msgid "Send message with an empty subject?"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:749
-msgid "Send message without an attachment?"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
 msgstr ""
 
-#. / 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..."
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Saadetud"
-
-#: ../../ui/login.glade:404
-msgid "Ser_ver:"
-msgstr "Ser_ver:"
-
-#: ../../ui/composer.glade:176
-msgid "Serif"
-msgstr "Serif"
-
-#: ../../ui/password-dialog.glade:352 ../../ui/password-dialog.glade:455
-msgid "Server:"
-msgstr "Server:"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Manuse lisamine ebaõnnestus"
 
-#: ../../ui/password-dialog.glade:259
-msgid "Service:"
-msgstr "Teenus:"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "Faili \"%s\" ei leitud."
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "Show Images"
-msgstr ""
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" on kaust."
 
-#: ../../ui/preferences.glade:193
-msgid "Show _notifications for new mail"
-msgstr "_Teavitamine uue kirja saabudes"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" on tühi fail."
 
-#: ../../ui/composer.glade:164
-msgid "Small"
-msgstr "Väike"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "Kirja \"%s\" avamine ebaõnnestus."
 
-#: ../../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Rämpspost"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "Fail \"%s\" on juba manuste nimekirjas."
 
-#: ../../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Lemmikud"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr ""
 
-#: ../../ui/login.glade:761
-msgid "Storage"
-msgstr "Kirjade kogu:"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr ""
 
-#: ../../ui/composer.glade:134
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Läbikriipsutus (Ctrl+K)"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:617
-msgid "Subject:"
-msgstr "Teema:"
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Teema: %s\n"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr ""
 
-#: ../../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Fondi värvi valimine"
 
-#: ../../src/client/geary-controller.vala:1493
-#, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
 msgstr ""
-"Sellenimeline fail on asukohas \"%s\" juba olemas. Selle asendamine kirjutab "
-"selle sisu üle."
 
-#: ../../src/client/geary-controller.vala:747
-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."
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
 msgstr ""
 
-#: ../../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."
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
 msgstr ""
 
-#: ../../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"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
 msgstr ""
 
-#: ../../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 ""
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/views/conversation-viewer.vala:1147
-msgid "This link appears to go to"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "This message contains remote images."
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
 msgstr ""
 
-#: ../../ui/composer.glade:435
-msgid "To add them as attachments"
-msgstr "Manuste lisamiseks"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Loobu"
 
-#: ../../src/client/views/conversation-viewer.vala:608
-msgid "To:"
-msgstr "Saaja:"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "Saaja: %s\n"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Prügi"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:294
-msgid "U_nstar"
-msgstr "Eemalda _lemmikutest"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:17
-msgid "Unable to login to email server"
-msgstr "Emaili serverisse logimine ebaõnnestus"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Eemalda"
 
-#: ../../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"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:701
-#, c-format
-msgid "Unable to open the database for %s"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:713
-#, c-format
-msgid "Unable to rebuild database for \"%s\""
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:619
-msgid "Unable to validate:\n"
-msgstr "Valideerimine ebaõnnestus:\n"
+#~ msgid "%u conversations selected."
+#~ msgstr "%u kirja valitud."
 
-#: ../../ui/composer.glade:127
-msgid "Underline (Ctrl+U)"
-msgstr "Allakriipsutus (Ctrl+U)"
+#~ msgid "%u read messages"
+#~ msgstr "%u loetud kirja"
 
-#: ../../ui/composer.glade:88
-msgid "Unquote text (Ctrl+[)"
-msgstr ""
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr "Oled sa kindel, et soovid selle konto eemaldada? "
 
-#: ../../src/client/geary-args.vala:65
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Tundmatu käsurea rida eelistus \"%s\"\n"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Konto eemaldamine ebaõnnestus</span> "
 
-#: ../../ui/login.glade:457
-msgid "User_name:"
-msgstr "Kasutaja_nimi:"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Uue kirja koostamise aken on juba avatud. Saada sõnum ära või sulge see "
+#~ "aken, seejärel proovi uuesti."
 
-#: ../../ui/password-dialog.glade:70 ../../ui/password-dialog.glade:181
-msgid "Username:"
-msgstr "Kasutajanimi:"
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Kõik selle konto Geary eelistused kustutatakse, kuid serveri eelistused, "
+#~ "andmed ning kirjad säilitatakse."
 
-#: ../../src/client/geary-application.vala:19
-msgid "Visit the Yorba web site"
-msgstr "Ava Yorba lehekülg"
+#~ msgid "Archive conversation (Delete, Backspace, A)"
+#~ msgstr "Arhiveeri kiri (Delete, Backspace, A)"
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-#, c-format
-msgid "Welcome to Geary."
-msgstr "Teretulemast meiliklienti Geary"
+#~ msgid "Archive conversations (Delete, Backspace, A)"
+#~ msgstr "Arhiveeri kirjad (Delete, Backspace, A)"
 
-#: ../../ui/login.glade:252
-msgid "Work, Home, etc."
-msgstr ""
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Rasvane (Ctrl+B)"
 
-#: ../../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid "C_olor"
+#~ msgstr "_Värv"
 
-#: ../../src/client/util/util-date.vala:177
-msgid "Yesterday"
-msgstr ""
+#~ msgid "Compose Message"
+#~ msgstr "Koosta uus kiri"
 
-#: ../../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 ""
-"Sinu IMAP-i ja/või SMTP eelistused ei täpsusta SSL-i või TLS-i. See "
-"tähendab, et sinu konto nimi ja parool pole kaitstud ning sinu võrgus olevad "
-"teised isikud võivad neid näha. Oled sa kindel, et soovid seda teha?"
+#~ msgid "Composer"
+#~ msgstr "Redigeerimine:"
 
-#: ../../src/client/geary-controller.vala:551
-msgid "Your settings are insecure"
-msgstr "Sinu eelistused on ebaturvalised"
+#~ msgid "Copyright 2011-2013 Yorba Foundation"
+#~ msgstr "Autoriõigused 2011-2013 Yorba Foundation"
 
-#: ../../src/client/geary-controller.vala:258
-#: ../../src/client/ui/stock.vala:21
-msgid "_About"
-msgstr "_Programmist lähemalt..."
+#~ msgid "Delete conversation (Delete, Backspace, A)"
+#~ msgstr "Kustuta kiri (Delete, Backspace, A)"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:22
-msgid "_Add"
-msgstr "_Lisa"
+#~ msgid "Delete conversations (Delete, Backspace, A)"
+#~ msgstr "Kustuta kirjad (Delete, Backspace, A)"
 
-#: ../../src/client/geary-controller.vala:47
-msgid "_Archive"
-msgstr "_Arhiveeri"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Oled sa kindel, et ei soovi kirja saata?"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Olgu"
+#~ msgid "Drop files here"
+#~ msgstr "Tiri failid siia"
 
-#: ../../ui/composer.glade:525
-msgid "_Attach File"
-msgstr "Manusta fail..."
+#~ msgid "Email address:"
+#~ msgstr "Emaili aadress:"
 
-#: ../../ui/preferences.glade:69
-msgid "_Automatically select next message"
-msgstr "Uue kirja _automaatne avamine"
+#~ msgid "Enable _spell checking"
+#~ msgstr "Õigekirja _kontrollimine"
 
-#: ../../src/client/ui/stock.vala:19
-msgid "_Cancel"
-msgstr "_Loobu"
+#~ msgid "Encr_yption:"
+#~ msgstr "Krüp_teering:"
 
-#: ../../ui/composer.glade:52
-msgid "_Center"
-msgstr "_Keskel"
+#~ msgid "Encrypt_ion:"
+#~ msgstr "Krüp_teering:"
 
-#: ../../src/client/ui/stock.vala:23
-msgid "_Close"
-msgstr ""
+#~ msgid "Geary Mail"
+#~ msgstr "Geary"
 
-#: ../../src/client/views/conversation-viewer.vala:889
-msgid "_Copy"
-msgstr "_Kopeeri"
+#~ msgid "IMAP Credentials"
+#~ msgstr "IMAP-i andmed"
 
-#: ../../src/client/geary-controller.vala:42
-msgid "_Delete"
-msgstr "_Kustuta"
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP eelistused:"
 
-#: ../../ui/password-dialog.glade:548
-msgid "_Details"
-msgstr "_Teave:"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Kursiiv (Ctrl+I)"
 
-#: ../../src/client/ui/stock.vala:24
-msgid "_Discard"
-msgstr ""
+#~ msgid "Large"
+#~ msgstr "Suur"
 
-#: ../../ui/preferences.glade:90
-msgid "_Display conversation preview"
-msgstr ""
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Veebilink (Ctrl+L)"
 
-#: ../../src/client/geary-controller.vala:262
-msgid "_Donate"
-msgstr ""
+#~ msgid "Medium"
+#~ msgstr "Keskmine"
 
-#: ../../ui/login.glade:782
-msgid "_Download mail:"
-msgstr "Kirjade _allalaadimine:"
+#~ msgid "N_ame:"
+#~ msgstr "_Nimi:"
 
-#: ../../ui/composer.glade:181
-msgid "_Fixed Width"
-msgstr ""
+#~ msgid "N_ickname:"
+#~ msgstr "_Konto nimi:"
 
-#: ../../src/client/geary-controller.vala:328
-#: ../../src/client/views/conversation-viewer.vala:1457
-msgid "_Forward"
-msgstr "_Suuna edasi..."
+#~ msgid "Nickname:"
+#~ msgstr "Konto nimi:"
 
-#: ../../src/client/geary-controller.vala:254
-#: ../../src/client/ui/stock.vala:25
-msgid "_Help"
-msgstr "_Abi..."
+#~ msgid "No authentication re_quired"
+#~ msgstr "Autentimine pole _vajalik"
 
-#: ../../ui/composer.glade:542
-msgid "_Include Original Attachments"
-msgstr ""
+#~ msgid "Notifications"
+#~ msgstr "Teated:"
 
-#: ../../src/client/views/conversation-viewer.vala:922
-msgid "_Inspect"
-msgstr "_Inspekteeri"
+#~ msgid "P_ort:"
+#~ msgstr "P_ort:"
 
-#: ../../ui/composer.glade:57
-msgid "_Justify"
-msgstr "_Servast servani"
+#~ msgid "Pass_word:"
+#~ msgstr "_Parool:"
 
-#: ../../src/client/ui/stock.vala:33
-msgid "_Keep"
-msgstr ""
+#~ msgid "Password:"
+#~ msgstr "Parool:"
 
-#: ../../src/client/geary-controller.vala:305
-msgid "_Label"
-msgstr "_Silt"
+#~ msgid "Please enter your email password"
+#~ msgstr "Palun sisesta oma e-maili parool"
 
-#: ../../ui/composer.glade:42
-msgid "_Left"
-msgstr "_Vasakul"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "E-maili konto andmete kontrollimine"
 
-#: ../../src/client/views/conversation-viewer.vala:1469
-msgid "_Mark as Read"
-msgstr "_Loetud"
+#~ msgid "Por_t:"
+#~ msgstr "Por_t:"
 
-#: ../../src/client/views/conversation-viewer.vala:1473
-msgid "_Mark as Unread"
-msgstr "_Lugemata"
+#~ msgid "Port:"
+#~ msgstr "Port:"
 
-#: ../../src/client/geary-controller.vala:271
-msgid "_Mark as..."
-msgstr "_Märgi kui..."
+#~ msgid "Reading"
+#~ msgstr "Lugemine:"
 
-#: ../../ui/composer.glade:157
-msgid "_Medium"
-msgstr ""
+#~ msgid "Real name:"
+#~ msgstr "Päris nimi:"
 
-#: ../../src/client/geary-controller.vala:309
-msgid "_Move"
-msgstr "_Liiguta asukohta"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Eemalda vormindus (Ctrl+Space)"
 
-#: ../../src/client/ui/stock.vala:18
-msgid "_OK"
-msgstr ""
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP Credentials"
 
-#: ../../src/client/ui/stock.vala:26
-msgid "_Open"
-msgstr ""
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP eelistused:"
 
-#: ../../ui/login.glade:131 ../../ui/login.glade:539
-#: ../../ui/password-dialog.glade:85
-msgid "_Password:"
-msgstr "_Parool:"
+#~ msgid "SSL"
+#~ msgstr "SSL"
 
-#: ../../ui/composer.glade:35
-msgid "_Paste"
-msgstr ""
+#~ msgid "SSL/TLS encryption:"
+#~ msgstr "SSL/TLS krüpteering:"
 
-#: ../../ui/preferences.glade:172
-msgid "_Play notification sounds"
-msgstr "_Heliliste teadete kasutamine"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../../src/client/geary-controller.vala:250
-#: ../../src/client/ui/stock.vala:27
-msgid "_Preferences"
-msgstr "_Eelistused"
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../../src/client/ui/stock.vala:28
-msgid "_Print..."
-msgstr ""
+#~ msgid "Se_rver:"
+#~ msgstr "Se_rver:"
 
-#: ../../src/client/geary-controller.vala:266
-#: ../../src/client/ui/stock.vala:29
-msgid "_Quit"
-msgstr "_Välju"
+#~ msgid "Send and receive email"
+#~ msgstr "Send and receive email"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "_Rebuild"
-msgstr ""
+#~ msgid "Ser_ver:"
+#~ msgstr "Ser_ver:"
 
-#: ../../ui/composer.glade:14
-msgid "_Redo"
-msgstr ""
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../../ui/password-dialog.glade:561
-msgid "_Remember passwords"
-msgstr "Parooli _meeldejätmine"
+#~ msgid "Server:"
+#~ msgstr "Server:"
 
-#: ../../src/client/ui/stock.vala:30
-msgid "_Remove"
-msgstr "_Eemalda"
+#~ msgid "Service:"
+#~ msgstr "Teenus:"
 
-#: ../../src/client/geary-controller.vala:1496
-msgid "_Replace"
-msgstr "_Asenda"
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "_Teavitamine uue kirja saabudes"
 
-#: ../../src/client/geary-controller.vala:317
-#: ../../src/client/views/conversation-viewer.vala:1447
-msgid "_Reply"
-msgstr "_Vasta..."
+#~ msgid "Small"
+#~ msgstr "Väike"
 
-#: ../../ui/composer.glade:141
-msgid "_Rich Text"
-msgstr ""
+#~ msgid "Storage"
+#~ msgstr "Kirjade kogu:"
 
-#: ../../ui/composer.glade:47
-msgid "_Right"
-msgstr "_Paremal"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Läbikriipsutus (Ctrl+K)"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:31
-msgid "_Save"
-msgstr "_Salvesta"
+#~ msgid "To add them as attachments"
+#~ msgstr "Manuste lisamiseks"
 
-#: ../../src/client/views/conversation-viewer.vala:1395
-msgid "_Save As..."
-msgstr "_Salvesta kui..."
+#~ msgid "Unable to login to email server"
+#~ msgstr "Emaili serverisse logimine ebaõnnestus"
 
-#: ../../src/client/views/conversation-viewer.vala:1414
-msgid "_Save Image As..."
-msgstr ""
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Allakriipsutus (Ctrl+U)"
 
-#: ../../ui/composer.glade:594
-msgid "_Send"
-msgstr "_Saada"
+#~ msgid "User_name:"
+#~ msgstr "Kasutaja_nimi:"
 
-#: ../../ui/composer.glade:163
-msgid "_Small"
-msgstr ""
+#~ msgid "Username:"
+#~ msgstr "Kasutajanimi:"
 
-#: ../../src/client/geary-controller.vala:289
-msgid "_Star"
-msgstr "_Lemmik"
+#~ msgid "_Attach File"
+#~ msgstr "Manusta fail..."
 
-#: ../../ui/composer.glade:7
-msgid "_Undo"
-msgstr ""
+#~ msgid "_Automatically select next message"
+#~ msgstr "Uue kirja _automaatne avamine"
 
-#: ../../ui/login.glade:522
-msgid "_Username:"
-msgstr "Kasutajanimi:"
+#~ msgid "_Center"
+#~ msgstr "_Keskel"
 
-#: ../../src/client/views/conversation-viewer.vala:1494
-msgid "_View Source"
-msgstr "_Vaata allikat..."
+#~ msgid "_Delete"
+#~ msgstr "_Kustuta"
 
-#. / 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 ""
+#~ msgid "_Details"
+#~ msgstr "_Teave:"
 
-#: ../../src/client/views/conversation-viewer.vala:1148
-msgid "but actually goes to"
-msgstr ""
+#~ msgid "_Download mail:"
+#~ msgstr "Kirjade _allalaadimine:"
 
-#: ../../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "baiti"
+#~ msgid "_Justify"
+#~ msgstr "_Servast servani"
 
-#. / Placeholder filename for attachments with no filename.
-#: ../../src/client/views/conversation-viewer.vala:1799
-#: ../../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "puudub"
+#~ msgid "_Left"
+#~ msgstr "_Vasakul"
 
-#: ../../src/client/views/conversation-find-bar.vala:226
-msgid "not found"
-msgstr ""
+#~ msgid "_Password:"
+#~ msgstr "_Parool:"
 
-#. / 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 "_Play notification sounds"
+#~ msgstr "_Heliliste teadete kasutamine"
+
+#~ msgid "_Remember passwords"
+#~ msgstr "Parooli _meeldejätmine"
+
+#~ msgid "_Right"
+#~ msgstr "_Paremal"
+
+#~ msgid "_Send"
+#~ msgstr "_Saada"
+
+#~ msgid "_Username:"
+#~ msgstr "Kasutajanimi:"
diff --git a/po/eu.po b/po/eu.po
index 5371bae..32e147b 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,401 +9,429 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-21 11:07+0200\n"
-"PO-Revision-Date: 2014-07-21 11:13+0200\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:02+0000\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo zundan com>\n"
 "Language-Team: Basque <librezale librezale org>\n"
-"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"eu/)\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.4\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Posta-bezeroa"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary posta"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:53+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: eu\n"
 
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Bidali eta jaso mezuak"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Zirriborroak | Zirriborroa | Drafts | Draft"
 
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "posta;helb.elek;helb.el.;"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
+"Bidalita | Posta bidalita | Mezua bidalita | Sent | Sent Mail | Sent Email | "
+"Sent E-Mail"
 
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Prestatu mezua"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
+"Baztergarria | Baztergarriak | Posta baztergarria | Mezu baztergarria | Junk "
+"| Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email | "
+"Bulk E-Mail"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Gorde"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Zakarrontzia | Trash | Rubbish | Rubbish Bin"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Gehitu"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:19
-msgid "Accounts"
-msgstr "Kontuak"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Sarrera"
 
-#. / 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/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Zirriborroak"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-#, c-format
-msgid "Welcome to Geary."
-msgstr "Ongi etorri Geary-ra."
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Bidalita"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-msgid "Enter your account information to get started."
-msgstr "Sartu zure kontuaren informazioa hasteko."
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Puntuatuta"
 
-#: ../src/client/accounts/add-edit-page.vala:247
-msgid "2 weeks back"
-msgstr "2 aste atzera"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Garrantzitsua"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:248
-msgid "1 month back"
-msgstr "Hilabete 1 atzera"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Posta guztiak"
 
-#: ../src/client/accounts/add-edit-page.vala:249
-msgid "3 months back"
-msgstr "3 hilabete atzera"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Baztergarriak"
 
-#: ../src/client/accounts/add-edit-page.vala:250
-msgid "6 months back"
-msgstr "6 hilabete atzera"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Zakarrontzia"
 
-#: ../src/client/accounts/add-edit-page.vala:251
-msgid "1 year back"
-msgstr "Urte 1 atzera"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Irteera"
 
-#: ../src/client/accounts/add-edit-page.vala:252
-msgid "2 years back"
-msgstr "2 urte atzera"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Bilatu"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "4 years back"
-msgstr "4 urte atzera"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Artxiboa"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "Everything"
-msgstr "Dena"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Bat ere ez"
 
-#: ../src/client/accounts/add-edit-page.vala:686
-msgid "Remem_ber passwords"
-msgstr "_Gogoratu pasahitzak"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:693 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "_Gogoratu pasahitza"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:727
-msgid "Unable to validate:\n"
-msgstr "Ezin da balidatu:\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:729
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Kontuaren goitizena baliogabea.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:732
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; Helbide elektronikoa jadanik Geary-ri gehituta.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:736
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP konexioaren errorea.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Bestelakoa"
 
-#: ../src/client/accounts/add-edit-page.vala:739
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; Okerreko IMAP erabiltzaile-izena edo pasahitza.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "eranskina"
 
-#: ../src/client/accounts/add-edit-page.vala:742
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP konexioaren errorea.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "bcc"
 
-#: ../src/client/accounts/add-edit-page.vala:745
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; Okerreko SMTP erabiltzaile-izena edo pasahitza.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "gorputza"
 
-#: ../src/client/accounts/add-edit-page.vala:749
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Konexioaren errorea.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "cc"
 
-#: ../src/client/accounts/add-edit-page.vala:753
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Okerreko erabiltzaile-izena edo pasahitza.\n"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "nork"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2014 Yorba Foundation"
-msgstr "Copyright-a 2011-2014 Yorba Fundazioa"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "gaia"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Bisitatu Yorba-ren webgunea"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "nori"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Abiarazi Geary leiho nagusia ezkutatuta"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "ni"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Irteerako arazketaren informazioa"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(gairik ez)"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Erregistratu berriketaren monitorizazioa"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %Y %b %e, %l:%M %p"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Erregistratu sarearen deserializatzea"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "%2$s(e)k %1$s(e)an idatzita:"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Erregistratu sareko jarduera"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "'%s'(e)k idatzita:"
 
-#. / 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 "Erregistratu IMAP gertaeren ilara"
+#. / 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:234
+msgid "On %s:"
+msgstr "%s(e)an:"
 
-#. / 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 "Erregistratu sarearen serializazioa"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Birbidalitako mezua ----------"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Erregistratu aldiko jarduera"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Nork: %s\n"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Erregistratu datu-basearen kontsultak (mezu ugari sortzen ditu)"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Gaia: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Erregistratu karpetaren normalizazioa"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Data: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Baimendu WebView aztertzea"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Nori: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Display program version"
-msgstr "Bistaratu programaren bertsioa"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Cc: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:49
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Erabili '%s' prestatzeko leiho berria irekitzeko"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "bat ere ez"
 
-#: ../src/client/application/geary-args.vala:50
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Bidali iruzkinak, iradokizunak eta eman akatsen berri hemen:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Posta-bezeroa"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:57
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Huts egin du komando-lerroaren aukerak aztertzean: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
 
-#: ../src/client/application/geary-args.vala:68
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Komando-lerroaren '%s' aukera ezezaguna\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Bisitatu Yorba-ren webgunea"
 
-#: ../src/client/application/geary-controller.vala:46
-msgid "_Delete"
-msgstr "E_zabatu"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:47
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Ezabatu berriketa (Maius+Ezabatu)"
 
-#: ../src/client/application/geary-controller.vala:48
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Ezabatu berriketa (Maius+Ezabatu)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:52
-msgid "_Trash"
-msgstr "_Zakarrontzia"
-
-#: ../src/client/application/geary-controller.vala:53
-msgid "Move conversation to trash (Delete, Backspace)"
-msgstr "Bota berriketa zakarrontzira (Ezabatu, Atzera tekla)"
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:54
-msgid "Move conversations to trash (Delete, Backspace)"
-msgstr "Bota berriketak zakarrontzira (Ezabatu, Atzera tekla)"
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Artxiboa"
 
-#: ../src/client/application/geary-controller.vala:59
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Artxibatu berriketa (A)"
 
-#: ../src/client/application/geary-controller.vala:60
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Artxibatu berriketak (A)"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Markatu _baztergarri gisa"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Markatu e_z-baztergarri gisa"
 
-#: ../src/client/application/geary-controller.vala:66
-#: ../src/client/application/geary-controller.vala:282
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Markatu berriketa"
 
-#: ../src/client/application/geary-controller.vala:67
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Markatu berriketak"
 
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Gehitu etiketa berriketari"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Gehitu etiketa berriketei"
 
-#: ../src/client/application/geary-controller.vala:70
-#: ../src/client/application/geary-controller.vala:321
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Aldatu berriketa lekuz"
 
-#: ../src/client/application/geary-controller.vala:71
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Aldatu berriketak lekuz"
 
-#: ../src/client/application/geary-controller.vala:258
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "K_ontuak"
 
-#: ../src/client/application/geary-controller.vala:263
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Hobespenak"
 
-#: ../src/client/application/geary-controller.vala:267
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ../src/client/application/geary-controller.vala:271
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "Honi _buruz"
 
-#: ../src/client/application/geary-controller.vala:275
-msgid "_Donate"
-msgstr "_Eman dirua"
-
-#: ../src/client/application/geary-controller.vala:279
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "I_rten"
 
-#: ../src/client/application/geary-controller.vala:284
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Markatu honela..."
 
-#: ../src/client/application/geary-controller.vala:290
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Markatu '_Irakurrita' gisa"
 
-#: ../src/client/application/geary-controller.vala:296
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: ../src/client/application/geary-controller.vala:302
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Izarra"
 
-#: ../src/client/application/geary-controller.vala:307
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "Ke_ndu izarra"
 
-#: ../src/client/application/geary-controller.vala:317
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Gehitu etiketa"
 
-#: ../src/client/application/geary-controller.vala:318
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Etiketa"
 
-#: ../src/client/application/geary-controller.vala:322
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "Aldatu _lekuz"
 
-#: ../src/client/application/geary-controller.vala:326
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Prestatu mezu berria (Ktrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:330
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1574
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Erantzun"
 
-#: ../src/client/application/geary-controller.vala:331
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Erantzun (Ktrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "Erantzun _denei"
 
-#: ../src/client/application/geary-controller.vala:336
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Erantzun _denei (Ktrl+Maius+R, Maius+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:341
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1584
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "A_urrera"
 
-#: ../src/client/application/geary-controller.vala:342
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Aurrera (Ktrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:625
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:746
+msgid "Unable to store server trust exception"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Zure ezarpenak ez dira seguruak"
 
-#: ../src/client/application/geary-controller.vala:626
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -413,17 +441,17 @@ msgstr ""
 "izena eta pasahitza sareko beste pertsona batek irakur ditzakeela adierazten "
 "du honek. Ziur zaude hau nahi duzula?"
 
-#: ../src/client/application/geary-controller.vala:627
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "_Jarraitu"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:705
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Errorea mezua bidaltzean"
 
-#: ../src/client/application/geary-controller.vala:706
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -431,14 +459,12 @@ msgstr ""
 "Errorea gertatu da mezu bat bidaltzean. Arazoak jarraitzen badu, ezabatu "
 "eskuz mezua zure Irteera karpetatik."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:710
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Errorea bidalitako mezua gordetzean"
 
-#: ../src/client/application/geary-controller.vala:711
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -446,17 +472,15 @@ msgstr ""
 "Errorea gertatu da bidalitako mezua Bidalita karpetan gordetzean. Arazoak "
 "jarraitzen badu, ezabatu eskuz mezua zure Irteera karpetatik."
 
-#: ../src/client/application/geary-controller.vala:780
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Etiketak"
 
-#: ../src/client/application/geary-controller.vala:792
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Ezin da '%s'(r)en datu-basea ireki"
 
-#: ../src/client/application/geary-controller.vala:793
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -479,21 +503,19 @@ msgstr ""
 "Datu-basea berreraikitzean lokaleko mezu guztiak (beraien eranskinekin) "
 "ezabatzea dakar. <b>Zerbitzariko zure mezuak ez dute eraginik jasoko.</b>"
 
-#: ../src/client/application/geary-controller.vala:795
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "_Berreraiki"
 
-#: ../src/client/application/geary-controller.vala:795
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "I_rten"
 
-#: ../src/client/application/geary-controller.vala:804
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Ezin da '%s'(r)en datu-basea berreraiki"
 
-#: ../src/client/application/geary-controller.vala:805
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -503,15 +525,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:827
-#: ../src/client/application/geary-controller.vala:837
-#: ../src/client/application/geary-controller.vala:848
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Ezin da '%s'(r)en lokaleko postontzia ireki"
 
-#: ../src/client/application/geary-controller.vala:828
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -529,7 +549,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:838
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -543,7 +563,7 @@ msgstr ""
 "\n"
 "Instalatu Geary-ren azken bertsioa eta saiatu berriro."
 
-#: ../src/client/application/geary-controller.vala:849
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -555,23 +575,29 @@ msgstr ""
 "\n"
 "Egiaztatu sareko konexioa eta berrabiarazi Geary."
 
-#: ../src/client/application/geary-controller.vala:1356
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "%s(r)i buruz"
 
 #. / 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-controller.vala:1359
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
-msgstr "Iñaki Larrañaga Murgoitio <dooteo zundan com>"
+msgstr ""
+"Iñaki Larrañaga Murgoitio <dooteo zundan com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Iñaki Larrañaga Murgoitio https://launchpad.net/~dooteo-zundan";
+
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1623
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Ziur zaude '%s' ireki nahi duzula?"
 
-#: ../src/client/application/geary-controller.vala:1624
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -579,1241 +605,1205 @@ msgstr ""
 "Eranskinek kalteak sor ditzakete sisteman irekitzen badira. Iturburu "
 "fidagarrietako fitxategiak bakarrik ireki."
 
-#: ../src/client/application/geary-controller.vala:1625
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "_Ez galdetu berriro"
 
-#: ../src/client/application/geary-controller.vala:1643
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "'%s' izeneko fitxategia badago lehendik. Ordeztea nahi duzu?"
 
-#: ../src/client/application/geary-controller.vala:1645
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "'%s'(e)n badago fitxategia lehendik. Hau ordeztean bere eduki guztia "
 "gainidatziko da."
 
-#: ../src/client/application/geary-controller.vala:1648
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Ordeztu"
 
-#: ../src/client/application/geary-controller.vala:1915
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Itxi irekitako mezu zirriborroak?"
 
-#: ../src/client/application/geary-controller.vala:2024
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Mezu hau betirako ezabatzea nahi duzu?"
 msgstr[1] "Mezu hauek betirako ezabatzea nahi dituzu?"
 
-#: ../src/client/application/geary-controller.vala:2026
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i bat dator"
-msgstr[1] "%i bat datoz"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i bat dator (doituta)"
-msgstr[1] "%i bat datoz (doituta)"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "ez da aurkitu"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/components/main-toolbar.vala:11
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Bilatu"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Abiarazi Geary leiho nagusia ezkutatuta"
 
-#: ../src/client/components/main-toolbar.vala:78
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Bilatu kontuaren mezu guztietan gako-hitzak (Ktrl+S)"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Irteerako arazketaren informazioa"
 
-#: ../src/client/components/main-toolbar.vala:212
-#, c-format
-msgid "Indexing %s account"
-msgstr "'%s' kontua indexatzen"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Erregistratu berriketaren monitorizazioa"
 
-#: ../src/client/components/main-toolbar.vala:223
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Bilatu '%s' kontua"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Erregistratu sarearen deserializatzea"
 
-#: ../src/client/components/main-window.vala:305
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Erregistratu sareko jarduera"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Bidaltzen..."
+#. / 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 "Erregistratu IMAP gertaeren ilara"
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_Ados"
+#. / 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 "Erregistratu sarearen serializazioa"
 
-#: ../src/client/components/stock.vala:19 ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Utzi"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Erregistratu aldiko jarduera"
 
-#: ../src/client/components/stock.vala:23 ../ui/account_list.glade.h:4
-#: ../ui/preferences.glade.h:2
-msgid "_Close"
-msgstr "It_xi"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Erregistratu datu-basearen kontsultak (mezu ugari sortzen ditu)"
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Baztertu"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Erregistratu karpetaren normalizazioa"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Ireki"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Baimendu WebView aztertzea"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "I_nprimatu..."
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr ""
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Kendu"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Bistaratu programaren bertsioa"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1042
-msgid "Select _All"
-msgstr "Hautatu _dena"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Erabili '%s' prestatzeko leiho berria irekitzeko"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Mantendu"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Bidali iruzkinak, iradokizunak eta eman akatsen berri hemen:"
 
-#: ../src/client/composer/composer-widget.vala:57
-msgid "Saved"
-msgstr "Gordeta"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Huts egin du komando-lerroaren aukerak aztertzean: %s\n"
 
-#: ../src/client/composer/composer-widget.vala:58
-msgid "Saving"
-msgstr "Gordetzen"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Komando-lerroaren '%s' aukera ezezaguna\n"
 
-#: ../src/client/composer/composer-widget.vala:59
-msgid "Error saving"
-msgstr "Errorea gordetzean"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Mezu berriak"
 
-#. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
-#: ../src/client/composer/composer-widget.vala:106
-msgid "attach|enclosed|enclosing|cover letter"
-msgstr "eranskina|inguratua|inguratzea|gutun-azala"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "Mezu berri %d"
+msgstr[1] "%d mezu berri"
 
-#: ../src/client/composer/composer-widget.vala:823
-msgid "Do you want to discard the unsaved message?"
-msgstr "Gorde gabeko mezua baztertzea nahi duzu?"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, mezu berri %d guztira"
+msgstr[1] "%s, %d mezu berri guztira"
 
-#: ../src/client/composer/composer-widget.vala:826
-#: ../src/client/composer/composer-widget.vala:830
-msgid "Do you want to discard this message?"
-msgstr "Mezu hau baztertzea nahi duzu?"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%1$s\n"
+"%3$s(r)en beste mezu berri %2$d"
+msgstr[1] ""
+"%1$s\n"
+"%3$s(r)en beste %2$d mezu berri"
 
-#: ../src/client/composer/composer-widget.vala:911
-msgid "Send message with an empty subject and body?"
-msgstr "Bidali gairik eta gorputzik gabeko mezua?"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Ireki"
 
-#: ../src/client/composer/composer-widget.vala:913
-msgid "Send message with an empty subject?"
-msgstr "Bidali gairik gabeko mezua?"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Ni"
 
-#: ../src/client/composer/composer-widget.vala:915
-msgid "Send message with an empty body?"
-msgstr "Bidali gorputzik gabeko mezua?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:917
-msgid "Send message without an attachment?"
-msgstr "Bidali eranskinik gabeko mezua?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:1100
-msgid "Cannot add attachment"
-msgstr "Ezin da eranskina gehitu"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:1111
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "Ezin izan da '%s' aurkitu."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:1118
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "'%s' karpeta da."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:1125
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "'%s' fitxategi hutsa da."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:1139
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "Ezin izan da '%s' irakurtzeko ireki."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:1146
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "'%s' jadanik bidaltzeko erantsita dago."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1155
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:1215
-msgid "To: "
-msgstr "Nori: "
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:1218
-msgid "Cc: "
-msgstr "Cc: "
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:1221
-msgid "Bcc: "
-msgstr "Bcc: "
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:1438
-msgid "Select Color"
-msgstr "Hautatu kolorea"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr ""
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:1884
-msgid "_From:"
-msgstr "_Nork:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr ""
 
-#. Composer label (without mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#. Geary account mail will be sent from
-#: ../src/client/composer/composer-widget.vala:1900
-#: ../src/client/conversation-viewer/conversation-viewer.vala:635
-#: ../ui/composer.glade.h:48
-msgid "From:"
-msgstr "Nork:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr ""
 
-#: ../src/client/composer/composer-window.vala:10
-msgid "New Message"
-msgstr "Mezu berria"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr ""
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Ni"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Aukeratu fitxategia"
+
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Erantsi"
+
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:260
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Kontuak"
+
+#. / 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/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Ongi etorri Geary-ra."
+
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Sartu zure kontuaren informazioa hasteko."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 aste atzera"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "Hilabete 1 atzera"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 hilabete atzera"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 hilabete atzera"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "Urte 1 atzera"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "2 urte atzera"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "4 urte atzera"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Dena"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "_Gogoratu pasahitzak"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "_Gogoratu pasahitza"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Ezin da balidatu:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Kontuaren goitizena baliogabea.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Helbide elektronikoa jadanik Geary-ri gehituta.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; IMAP konexioaren errorea.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Okerreko IMAP erabiltzaile-izena edo pasahitza.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; SMTP konexioaren errorea.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; Okerreko SMTP erabiltzaile-izena edo pasahitza.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Konexioaren errorea.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Okerreko erabiltzaile-izena edo pasahitza.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Gorde"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Gehitu"
+
+#. / 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 "%l:%M %P"
+
+#. / 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 "%b %e"
+
+#. / 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 ""
+
+#. / 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 "%Y %B %e, %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 "%Y %B %e, %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 "%Y %B %e, %l:%M %P"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Orain"
+
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "Duela %dm"
+msgstr[1] "Duela %dm"
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "Duela %do"
+msgstr[1] "Duela %do"
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Atzo"
+
+#. / 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
+msgid "%A"
+msgstr "%A"
+
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "byte"
+
+#: ../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/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "mezu %d"
+msgstr[1] "%d mezu"
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d irakurri gabe"
+msgstr[1] "%d irakurri gabe"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s (%s)"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Sarrera"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Bilatu '%s' kontua"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "Emaitza %d"
+msgstr[1] "%d emaitz"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "Ez da berriketarik hautatu."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:262
-#, c-format
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "Berriketa %u hautatuta."
 msgstr[1] "%u berriketa hautatuta."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:291
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
 msgid "No search results found."
 msgstr "Ez da bilaketaren emaitzarik aurkitu."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:293
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
 msgid "No conversations in folder."
 msgstr "Ez dago berriketarik karpetan."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:534
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
 msgid "This message contains remote images."
 msgstr "Mezu honek urruneko irudiak ditu."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:534
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
 msgid "Show Images"
 msgstr "Erakutsi irudiak"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:535
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
 msgid "Always Show From Sender"
 msgstr "Erakutsi beti bidaltzailetik"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:559
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
 msgid "Edit Draft"
 msgstr "Editatu zirriborroa"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:638
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "Nork:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
 msgid "To:"
 msgstr "Nori:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:641
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
 msgid "Cc:"
 msgstr "Cc:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:644
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:647
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
 msgid "Subject:"
 msgstr "Gaia:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:650
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
 msgid "Date:"
 msgstr "Data:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:857
-#, c-format
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "Mezu %u irakurrita"
 msgstr[1] "%u mezu irakurrita"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:989
-#, c-format
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr "Mezu hori ongi bidali da, baina ez da '%s'(e)n gorde."
 
-#. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1015
-#: ../ui/composer.glade.h:4
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
 msgid "_Copy"
 msgstr "_Kopiatu"
 
-#. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1023
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "Kopiatu _helbide elektronikoa"
 
-#. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1028
-#: ../ui/composer.glade.h:17
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
 msgid "Copy _Link"
 msgstr "Kopiatu _esteka"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1036
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "Hautatu _mezua"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1048
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Hautatu _dena"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "_Aztertu"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1274
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
 msgid "This link appears to go to"
 msgstr "Esteka hori hona bideratzen duela dirudi:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1275
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
 msgid "but actually goes to"
 msgstr "baina benetan hona zuzentzen du:"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
 msgstr " (baliogabea?)"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1522
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
+msgstr "Gorde irudia _honela..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
 msgid "_Save As..."
 msgstr "Gorde _honela..."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1527
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
 msgid "Save All A_ttachments..."
 msgstr "Gorde eranskin _guztiak..."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1541
-msgid "_Save Image As..."
-msgstr "Gorde irudia _honela..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1564
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
 msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] "Gorde _eranskina..."
 msgstr[1] "Gorde _eranskin guztiak..."
 
-#. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1579
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "Erantzun g_uztiei"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1596
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "_Markatu irakurritako gisa"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1600
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
 msgid "_Mark as Unread"
 msgstr "_Markatu 'Irakurri gabea'"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1606
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
 msgid "Mark Unread From _Here"
 msgstr "Markatu irakurri gabe _hemendik"
 
-#. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1621
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "Ikusi i_turburua"
 
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1915
-#: ../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "bat ere ez"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2045
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "Huts egin du testuaren editore lehenetsia irekitzean."
 
-#: ../src/client/conversation-viewer/conversation-web-view.vala:321
-#, c-format
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
 msgid "%s - Conversation Inspector"
 msgstr "%s - bihurketaren ikustatzailea"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Aukeratu fitxategia"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Gordeta"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Erantsi"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Gordetzen"
 
-#: ../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your password"
-msgstr "Sartu zure pasahitza"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Errorea gordetzean"
 
-#. 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] "mezu %d"
-msgstr[1] "%d mezu"
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr ""
 
-#. / 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 irakurri gabe"
-msgstr[1] "%d irakurri gabe"
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Mezu berria"
 
-#. / 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/composer/composer-widget.vala:138
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
+msgstr ""
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Sarrera"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Mezu hau baztertzea nahi duzu?"
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "Emaitza %d"
-msgstr[1] "%d emaitz"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Bidali gairik eta gorputzik gabeko mezua?"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Mezu berriak"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Bidali gairik gabeko mezua?"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "Mezu berri %d"
-msgstr[1] "%d mezu berri"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Bidali gorputzik gabeko mezua?"
 
-#: ../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] "%s, mezu berri %d guztira"
-msgstr[1] "%s, %d mezu berri guztira"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Bidali eranskinik gabeko mezua?"
 
-#: ../src/client/notification/libnotify.vala:107
-#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
-"%1$s\n"
-"%3$s(r)en beste mezu berri %2$d"
-msgstr[1] ""
-"%1$s\n"
-"%3$s(r)en beste %2$d mezu berri"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Ezin da eranskina gehitu"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Ireki"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "Ezin izan da '%s' aurkitu."
 
-#. / 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"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "'%s' karpeta da."
 
-#. / 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"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "'%s' fitxategi hutsa da."
 
-#. / 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"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "Ezin izan da '%s' irakurtzeko ireki."
 
-#. / 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 "%b %e"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "'%s' jadanik bidaltzeko erantsita dago."
 
-#. / 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"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Nori: "
+
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Cc: "
+
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Bcc: "
+
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
 msgstr ""
 
-#. / 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 "%Y %B %e, %l:%M %P"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Hautatu kolorea"
 
-#. / 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 "%Y %B %e, %H:%M"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr ""
 
-#. / 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 "%Y %B %e, %l:%M %P"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_Nork:"
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Orain"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "Duela %dm"
-msgstr[1] "Duela %dm"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Bidaltzen..."
 
-#: ../src/client/util/util-date.vala:171
-#, c-format
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "Duela %do"
-msgstr[1] "Duela %do"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i bat dator"
+msgstr[1] "%i bat datoz"
 
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "Atzo"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i bat dator (doituta)"
+msgstr[1] "%i bat datoz (doituta)"
 
-#. / 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/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "ez da aurkitu"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:741
-msgid "(no subject)"
-msgstr "(gairik ez)"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_Ados"
 
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "byte"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Utzi"
 
-#: ../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "It_xi"
 
-#: ../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Baztertu"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Ireki"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "I_nprimatu..."
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Kendu"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Mantendu"
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Bilatu kontuaren mezu guztietan gako-hitzak (Ktrl+S)"
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Bestelakoa"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "'%s' kontua indexatzen"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Sarrera"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Zirriborroak"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary posta"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Bidalita"
+#~ msgid "Send and receive email"
+#~ msgstr "Bidali eta jaso mezuak"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Puntuatuta"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "posta;helb.elek;helb.el.;"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Garrantzitsua"
+#~ msgid "Compose Message"
+#~ msgstr "Prestatu mezua"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Posta guztiak"
+#~ msgid "Copyright 2011-2014 Yorba Foundation"
+#~ msgstr "Copyright-a 2011-2014 Yorba Fundazioa"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Baztergarriak"
+#~ msgid "_Delete"
+#~ msgstr "E_zabatu"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Zakarrontzia"
+#~ msgid "_Trash"
+#~ msgstr "_Zakarrontzia"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Irteera"
+#~ msgid "Move conversation to trash (Delete, Backspace)"
+#~ msgstr "Bota berriketa zakarrontzira (Ezabatu, Atzera tekla)"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Artxiboa"
+#~ msgid "Move conversations to trash (Delete, Backspace)"
+#~ msgstr "Bota berriketak zakarrontzira (Ezabatu, Atzera tekla)"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:25
-msgid "None"
-msgstr "Bat ere ez"
+#~ msgid "_Donate"
+#~ msgstr "_Eman dirua"
 
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.
-#: ../src/engine/imap-db/imap-db-account.vala:662
-msgid "attachment"
-msgstr "eranskina"
+#~ msgid "attach|enclosed|enclosing|cover letter"
+#~ msgstr "eranskina|inguratua|inguratzea|gutun-azala"
 
-#. / Can be typed in the search box like bcc:johndoe example com to find
-#. / messages bcc'd to a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:665
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "bcc"
-msgstr "bcc"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Gorde gabeko mezua baztertzea nahi duzu?"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:668
-msgid "body"
-msgstr "gorputza"
+#~ msgid "Please enter your password"
+#~ msgstr "Sartu zure pasahitza"
 
-#. / Can be typed in the search box like cc:johndoe example com to find
-#. / messages cc'd to a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:671
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "cc"
-msgstr "cc"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Ezin da kontua kendu</span> "
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.
-#: ../src/engine/imap-db/imap-db-account.vala:674
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "from"
-msgstr "nork"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Kontu honekin esleitutako konposatzailearen leihoa irekita dago. Bidali edo "
+#~ "baztertu mezua eta saiatu berriro."
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:677
-msgid "subject"
-msgstr "gaia"
+#~ msgid "Add account"
+#~ msgstr "Gehitu kontua"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:680
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "to"
-msgstr "nori"
+#~ msgid "Edit account"
+#~ msgstr "Editatu kontua"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.
-#: ../src/engine/imap-db/imap-db-account.vala:699
-msgid "me"
-msgstr "ni"
+#~ msgid "Remove account"
+#~ msgstr "Kendu kontua"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:535
-msgid "Drafts | Draft"
-msgstr "Zirriborroak | Zirriborroa | Drafts | Draft"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Itxaron Geary-k zure kontua balidatu arte."
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:540
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr ""
-"Bidalita | Posta bidalita | Mezua bidalita | Sent | Sent Mail | Sent Email | "
-"Sent E-Mail"
+#~ msgid "_Undo"
+#~ msgstr "_Desegin"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:545
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
-msgstr ""
-"Baztergarria | Baztergarriak | Posta baztergarria | Mezu baztergarria | Junk "
-"| Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email | "
-"Bulk E-Mail"
+#~ msgid "_Redo"
+#~ msgstr "_Berregin"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:550
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Zakarrontzia | Trash | Rubbish | Rubbish Bin"
+#~ msgid "Cu_t"
+#~ msgstr "_Ebaki"
 
-#. / 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, %Y %b %e, %l:%M %p"
+#~ msgid "_Paste"
+#~ msgstr "_Itsatsi"
 
-#. / 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 "%2$s(e)k %1$s(e)an idatzita:"
+#~ msgid "_Left"
+#~ msgstr "E_zkerrean"
 
-#. / 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'(e)k idatzita:"
+#~ msgid "_Right"
+#~ msgstr "E_skuinean"
 
-#. / 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 "%s(e)an:"
+#~ msgid "_Center"
+#~ msgstr "_Erdian"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Birbidalitako mezua ----------"
+#~ msgid "_Justify"
+#~ msgstr "_Justifikatu"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "Nork: %s\n"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Estekatu (Ktrl+L)"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Gaia: %s\n"
+#~ msgid "C_olor"
+#~ msgstr "_Kolorea"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "Data: %s\n"
+#~ msgid "More options"
+#~ msgstr "Aukera gehiago"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "Nori: %s\n"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Jarri komatxoak testuari (Ktrl+])"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Cc: %s\n"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Kendu komatxoak testutik (Ctrl+[)"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">Ezin da kontua kendu</span> "
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Kendu formatua (Ktrl+Zuriunea)"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Kontu honekin esleitutako konposatzailearen leihoa irekita dago. Bidali edo "
-"baztertu mezua eta saiatu berriro."
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Itsatsi _formatuarekin"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Gehitu kontua"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Lodia (Ktrl+B)"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Editatu kontua"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Etzana (Ktrl+I)"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Kendu kontua"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Azpimarratua (Ktrl+U)"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Itxaron Geary-k zure kontua balidatu arte."
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Marratua (Ktrl+K)"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Desegin"
+#~ msgid "_Rich Text"
+#~ msgstr "Testu a_beratsa"
 
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Berregin"
+#~ msgid "Lar_ge"
+#~ msgstr "_Handia"
 
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "_Ebaki"
+#~ msgid "Large"
+#~ msgstr "Handia"
 
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "_Itsatsi"
+#~ msgid "_Medium"
+#~ msgstr "_Ertaina"
 
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "E_zkerrean"
+#~ msgid "Medium"
+#~ msgstr "Ertaina"
 
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "E_skuinean"
+#~ msgid "_Small"
+#~ msgstr "T_xikia"
 
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Erdian"
+#~ msgid "Small"
+#~ msgstr "Txikia"
 
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Justifikatu"
+#~ msgid "S_ans Serif"
+#~ msgstr "S_ans serif"
 
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Estekatu (Ktrl+L)"
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "_Kolorea"
+#~ msgid "S_erif"
+#~ msgstr "S_erif"
 
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Aukera gehiago"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Jarri komatxoak testuari (Ktrl+])"
+#~ msgid "_Fixed Width"
+#~ msgstr "_Zabalera finkoa"
 
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Kendu komatxoak testutik (Ctrl+[)"
+#~ msgid "Fixed Width"
+#~ msgstr "Zabalera finkoa"
 
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Kendu formatua (Ktrl+Zuriunea)"
+#~ msgid "Detach"
+#~ msgstr "Desuztartu"
 
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Itsatsi _formatuarekin"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Lodia (Ktrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Etzana (Ktrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Azpimarratua (Ktrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Marratua (Ktrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "Testu a_beratsa"
-
-#: ../ui/composer.glade.h:23
-msgid "Lar_ge"
-msgstr "_Handia"
-
-#: ../ui/composer.glade.h:24
-msgid "Large"
-msgstr "Handia"
-
-#: ../ui/composer.glade.h:25
-msgid "_Medium"
-msgstr "_Ertaina"
-
-#: ../ui/composer.glade.h:26
-msgid "Medium"
-msgstr "Ertaina"
-
-#: ../ui/composer.glade.h:27
-msgid "_Small"
-msgstr "T_xikia"
-
-#: ../ui/composer.glade.h:28
-msgid "Small"
-msgstr "Txikia"
-
-#: ../ui/composer.glade.h:29
-msgid "S_ans Serif"
-msgstr "S_ans serif"
-
-#: ../ui/composer.glade.h:30
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: ../ui/composer.glade.h:31
-msgid "S_erif"
-msgstr "S_erif"
-
-#: ../ui/composer.glade.h:32
-msgid "Serif"
-msgstr "Serif"
-
-#: ../ui/composer.glade.h:33
-msgid "_Fixed Width"
-msgstr "_Zabalera finkoa"
-
-#: ../ui/composer.glade.h:34
-msgid "Fixed Width"
-msgstr "Zabalera finkoa"
-
-#: ../ui/composer.glade.h:35
-msgid "Detach"
-msgstr "Desuztartu"
-
-#: ../ui/composer.glade.h:36
-msgid "_Send"
-msgstr "_Bidali"
-
-#: ../ui/composer.glade.h:37
-msgid "Send"
-msgstr "Bidali"
-
-#: ../ui/composer.glade.h:38
-msgid "_Attach File"
-msgstr "_Erantsi fitxategia"
-
-#: ../ui/composer.glade.h:39
-msgid "Attach File"
-msgstr "Erantsi fitxategia"
-
-#: ../ui/composer.glade.h:40
-msgid "_Include Original Attachments"
-msgstr "_Barneratu jatorrizko eranskinak"
-
-#: ../ui/composer.glade.h:41
-msgid "Include Original Attachments"
-msgstr "Barneratu jatorrizko eranskinak"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:43
-msgid "_To:"
-msgstr "Nor_i:"
+#~ msgid "_Send"
+#~ msgstr "_Bidali"
 
-#: ../ui/composer.glade.h:44
-msgid "_Cc:"
-msgstr "_Cc:"
+#~ msgid "Send"
+#~ msgstr "Bidali"
 
-#: ../ui/composer.glade.h:45
-msgid "_Subject:"
-msgstr "_Gaia:"
+#~ msgid "_Attach File"
+#~ msgstr "_Erantsi fitxategia"
 
-#: ../ui/composer.glade.h:46
-msgid "_Bcc:"
-msgstr "_Bcc:"
+#~ msgid "Attach File"
+#~ msgstr "Erantsi fitxategia"
 
-#: ../ui/composer.glade.h:49
-msgid "Drop files here"
-msgstr "Jaregin fitxategiak hemen"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Barneratu jatorrizko eranskinak"
 
-#: ../ui/composer.glade.h:50
-msgid "To add them as attachments"
-msgstr "Eranskin gisa gehitzeko"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Barneratu jatorrizko eranskinak"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Bilatu:"
+#~ msgid "_To:"
+#~ msgstr "Nor_i:"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Aurrekoa"
+#~ msgid "_Cc:"
+#~ msgstr "_Cc:"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Hurrengoa"
+#~ msgid "_Subject:"
+#~ msgstr "_Gaia:"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Maiuskula/minuskula"
+#~ msgid "_Bcc:"
+#~ msgstr "_Bcc:"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "etiketa"
+#~ msgid "Drop files here"
+#~ msgstr "Jaregin fitxategiak hemen"
 
-#: ../ui/login.glade.h:1
-msgid "Password"
-msgstr "Pasahitza"
+#~ msgid "To add them as attachments"
+#~ msgstr "Eranskin gisa gehitzeko"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "_Helb. elektronikoa"
+#~ msgid "Find:"
+#~ msgstr "Bilatu:"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Pasahitza"
+#~ msgid "_Previous"
+#~ msgstr "_Aurrekoa"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "_Zerbitzua"
+#~ msgid "_Next"
+#~ msgstr "_Hurrengoa"
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "_Izena"
+#~ msgid "_Case sensitive"
+#~ msgstr "_Maiuskula/minuskula"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "_Goitizena"
+#~ msgid "label"
+#~ msgstr "etiketa"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Lana, etxea, e.a."
+#~ msgid "Password"
+#~ msgstr "Pasahitza"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_Gorde bidalitako mezua"
+#~ msgid "E_mail address"
+#~ msgstr "_Helb. elektronikoa"
 
-#: ../ui/login.glade.h:10
-msgid "IMAP settings"
-msgstr "IMAP ezarpenak"
+#~ msgid "_Password"
+#~ msgstr "_Pasahitza"
 
-#: ../ui/login.glade.h:11
-msgid "Se_rver"
-msgstr "_Zerbitzaria"
+#~ msgid "S_ervice"
+#~ msgstr "_Zerbitzua"
 
-#: ../ui/login.glade.h:12
-msgid "P_ort"
-msgstr "A_taka"
+#~ msgid "N_ame"
+#~ msgstr "_Izena"
 
-#: ../ui/login.glade.h:13
-msgid "Ser_ver"
-msgstr "_Zerbitzaria"
+#~ msgid "N_ickname"
+#~ msgstr "_Goitizena"
 
-#: ../ui/login.glade.h:14
-msgid "Por_t"
-msgstr "_Ataka"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Lana, etxea, e.a."
 
-#: ../ui/login.glade.h:15
-msgid "SMTP settings"
-msgstr "SMTP ezarpenak"
+#~ msgid "_Save sent mail"
+#~ msgstr "_Gorde bidalitako mezua"
 
-#: ../ui/login.glade.h:16
-msgid "User_name"
-msgstr "_Erabiltzaile-izena"
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP ezarpenak"
 
-#: ../ui/login.glade.h:17
-msgid "Pass_word"
-msgstr "_Pasahitza"
+#~ msgid "Se_rver"
+#~ msgstr "_Zerbitzaria"
 
-#: ../ui/login.glade.h:18
-msgid "SMTP username"
-msgstr "SMTP erabiltzaile-izena"
+#~ msgid "P_ort"
+#~ msgstr "A_taka"
 
-#: ../ui/login.glade.h:19
-msgid "SMTP password"
-msgstr "SMTP pasahitza"
+#~ msgid "Ser_ver"
+#~ msgstr "_Zerbitzaria"
 
-#: ../ui/login.glade.h:20
-msgid "_Username"
-msgstr "_Erabiltzaile-izena"
+#~ msgid "Por_t"
+#~ msgstr "_Ataka"
 
-#: ../ui/login.glade.h:21
-msgid "IMAP username"
-msgstr "IMAP erabiltzaile-izena"
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP ezarpenak"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP password"
-msgstr "IMAP pasahitza"
+#~ msgid "User_name"
+#~ msgstr "_Erabiltzaile-izena"
 
-#: ../ui/login.glade.h:23
-msgid "Encr_yption"
-msgstr "_Enkriptazioa"
+#~ msgid "Pass_word"
+#~ msgstr "_Pasahitza"
 
-#: ../ui/login.glade.h:24
-msgid "Encrypt_ion"
-msgstr "Enk_riptazioa"
+#~ msgid "SMTP username"
+#~ msgstr "SMTP erabiltzaile-izena"
 
-#: ../ui/login.glade.h:26
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "SMTP password"
+#~ msgstr "SMTP pasahitza"
 
-#: ../ui/login.glade.h:27
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "_Username"
+#~ msgstr "_Erabiltzaile-izena"
 
-#: ../ui/login.glade.h:28
-msgid "No authentication re_quired"
-msgstr "Ez da autentifikaziorik behar"
+#~ msgid "IMAP username"
+#~ msgstr "IMAP erabiltzaile-izena"
 
-#: ../ui/login.glade.h:29
-msgid "Use IMAP cre_dentials"
-msgstr "Erabili IMAP _kredentzialak"
+#~ msgid "IMAP password"
+#~ msgstr "IMAP pasahitza"
 
-#: ../ui/login.glade.h:30
-msgid "Storage"
-msgstr "Biltegia"
+#~ msgid "Encr_yption"
+#~ msgstr "_Enkriptazioa"
 
-#: ../ui/login.glade.h:31
-msgid "_Download mail"
-msgstr "_Deskargatu posta"
+#~ msgid "Encrypt_ion"
+#~ msgstr "Enk_riptazioa"
 
-#: ../ui/login.glade.h:32 ../ui/preferences.glade.h:6
-msgid "Composer"
-msgstr "Konposatzailea"
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
 
-#: ../ui/login.glade.h:33
-msgid "Save dra_fts on server"
-msgstr "Gorde _zirriborroak zerbitzarian"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/login.glade.h:34
-msgid "Si_gn emails:"
-msgstr "_Sinatu mezuak:"
+#~ msgid "No authentication re_quired"
+#~ msgstr "Ez da autentifikaziorik behar"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "SMTP kredentzialak"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Erabili IMAP _kredentzialak"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username:"
-msgstr "Erabiltzaile-izena:"
+#~ msgid "Storage"
+#~ msgstr "Biltegia"
 
-#: ../ui/password-dialog.glade.h:3
-msgid "Password:"
-msgstr "Pasahitza:"
+#~ msgid "_Download mail"
+#~ msgstr "_Deskargatu posta"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Gogoratu pasahitza"
+#~ msgid "Composer"
+#~ msgstr "Konposatzailea"
 
-#: ../ui/preferences.glade.h:1
-msgid "Preferences"
-msgstr "Hobespenak"
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Gorde _zirriborroak zerbitzarian"
 
-#: ../ui/preferences.glade.h:3
-msgid "Reading"
-msgstr "Irakurketa"
+#~ msgid "Si_gn emails:"
+#~ msgstr "_Sinatu mezuak:"
 
-#: ../ui/preferences.glade.h:4
-msgid "_Automatically select next message"
-msgstr "Hautatu _automatikoki hurrengo mezua"
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP kredentzialak"
 
-#: ../ui/preferences.glade.h:5
-msgid "_Display conversation preview"
-msgstr "_Bistaratu berriketaren aurrebista"
+#~ msgid "Username:"
+#~ msgstr "Erabiltzaile-izena:"
 
-#: ../ui/preferences.glade.h:7
-msgid "Enable _spell checking"
-msgstr "Gaitu _ortografia-egiaztapena"
+#~ msgid "Password:"
+#~ msgstr "Pasahitza:"
 
-#: ../ui/preferences.glade.h:8
-msgid "Notifications"
-msgstr "Jakinarazpenak"
+#~ msgid "_Remember password"
+#~ msgstr "_Gogoratu pasahitza"
 
-#: ../ui/preferences.glade.h:9
-msgid "_Play notification sounds"
-msgstr "_Erreproduzitu jakinarazpenaren soinuak"
+#~ msgid "Preferences"
+#~ msgstr "Hobespenak"
 
-#: ../ui/preferences.glade.h:10
-msgid "Show _notifications for new mail"
-msgstr "Erakutsi mezu berrien _jakinarazpenak"
+#~ msgid "Reading"
+#~ msgstr "Irakurketa"
 
-#: ../ui/preferences.glade.h:11
-msgid "Notify of new mail at start_up"
-msgstr "Jakinarazi mezu berriak _abioan"
+#~ msgid "_Automatically select next message"
+#~ msgstr "Hautatu _automatikoki hurrengo mezua"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Ziur zaude kontu hori ezabatzea nahi "
-"duzula?</span> "
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Bistaratu berriketaren aurrebista"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Kontu honekin esleitutako mezu guztiak ordenagailutik ezabatuko dira. Ez dio "
-"zerbitzariko mezuei eraginik egingo."
+#~ msgid "Enable _spell checking"
+#~ msgstr "Gaitu _ortografia-egiaztapena"
+
+#~ msgid "Notifications"
+#~ msgstr "Jakinarazpenak"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Erreproduzitu jakinarazpenaren soinuak"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Erakutsi mezu berrien _jakinarazpenak"
+
+#~ msgid "Notify of new mail at start_up"
+#~ msgstr "Jakinarazi mezu berriak _abioan"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Ziur zaude kontu hori ezabatzea nahi "
+#~ "duzula?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Kontu honekin esleitutako mezu guztiak ordenagailutik ezabatuko dira. Ez dio "
+#~ "zerbitzariko mezuei eraginik egingo."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Goitizena:"
+#~ msgid "Nickname:"
+#~ msgstr "Goitizena:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Helb. elektronikoa:"
+#~ msgid "Email address:"
+#~ msgstr "Helb. elektronikoa:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary upgrade in progress."
-msgstr "Geary-ren eguneraketa lantzen."
+#~ msgid "Geary upgrade in progress."
+#~ msgstr "Geary-ren eguneraketa lantzen."
 
 #~ msgid "C_lose"
 #~ msgstr "It_xi"
diff --git a/po/fa.po b/po/fa.po
index 5d0f07b..8fe91c3 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -9,517 +9,508 @@ 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-10-07 23:10+0000\n"
-"Last-Translator: Hessam.08 <h shahpouri yandex com>\n"
-"Language-Team: Persian (http://www.transifex.com/projects/p/geary/language/";
-"fa/)\n"
-"Language: fa\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:02+0000\n"
+"Last-Translator: Hessam Shahpouri <Unknown>\n"
+"Language-Team: Persian "
+"(http://www.transifex.com/projects/p/geary/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:55+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: fa\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:641
-msgid "        &#8226; Connection error.\n"
-msgstr "&#8226; خطا در ارتباط.\n"
-
-#: ../../src/client/accounts/add-edit-page.vala:624
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "&#8226; آدرس ایمیل در حال حاظر به Geary افزوده شده است.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:628
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "&#8226; خطا در ارتباط IMAP.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:631
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "&#8226; نام کاربری و کلمه عبور نادرست برای IMAP.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:621
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "&#8226; لقب (Nickname) نادرست برای حساب کاربری.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:634
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "&#8226; خطای ارتباط SMTP.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "&#8226; نام کاربری و کلمه عبور نادرست برای SMTP.\n"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "صندوق ورودی"
 
-#: ../../src/client/accounts/add-edit-page.vala:645
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "&#8226; نام کاربری و کلمه عبور نادرست.\n"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "چرک نویس‌ها"
 
-#: ../../src/client/views/conversation-viewer.vala:1203
-msgid " (Invalid?)"
-msgstr "(نامعتبر؟)"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "ایمیل‌های ارسال شده"
 
-#: ../../src/client/composer/composer-window.vala:972
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "فایل « %s » در حال حاظر برای تحویل پیوست شده است."
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "ستاره دار"
 
-#: ../../src/client/composer/composer-window.vala:937
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "فایل « %s » پیدا نشد."
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "با اهمیت"
 
-#: ../../src/client/composer/composer-window.vala:965
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "امکان باز کردن فایل « %s » برای خواندن آن وجود ندارد."
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "همه‌ی ایمیل‌ها"
 
-#: ../../src/client/composer/composer-window.vala:944
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "« %s » یک پوشه است."
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "هرزنامه"
 
-#: ../../src/client/composer/composer-window.vala:951
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "فایل « %s » خالی است."
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "زباله دان"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "صندوق خروجی"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "جستجو"
 
-#. / 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 "%B %-e, %Y %-l:%M %P"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "بایگانی"
 
-#. / 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 "%B %-e, %Y %-l:%M %P"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "هیچکدام"
 
-#. / 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"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr ""
 
-#. / 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, %b %-e, %Y at %-l:%M %p"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "جی میل (ایمیل گوگل)"
 
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] "%d پیام"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "ایمیل یاهو"
 
-#: ../../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d پیام جدید"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "اوت لوک (مایکروسافت)"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:43
-#, c-format
-msgid "%d results"
-msgstr "%d مورد"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "موارد دیگر"
 
-#. / 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 خوانده نشده"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr ""
 
-#: ../../src/client/util/util-date.vala:170
-#, c-format
-msgid "%dh ago"
-msgstr "%d ساعت قبل"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr ""
 
-#: ../../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgstr "%d دقیقه قبل"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:222
-#, c-format
-msgid "%i matches"
-msgstr "%i مورد مشابه"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:224
-#, c-format
-msgid "%i matches (wrapped)"
-msgstr "%i مورد مشابه (کوتاه شده)"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr ""
 
-#. / 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"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr ""
 
-#. / 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"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:107
-#, 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 پیام جدید دیگر برای %s)"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr ""
 
-#. / 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)"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(بدون موضوع)"
 
-#: ../../src/client/views/conversation-web-view.vala:289
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - بازرس گفتگوها"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %b %-e, %Y at %-l:%M %p"
 
-#: ../../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - پیام جدید"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "در %1$s, %2$s نوشته بود:"
 
 #. / 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
+#: ../src/engine/rfc822/rfc822-utils.vala:228
 msgid "%s wrote:"
 msgstr "%s نوشته است:"
 
-#: ../../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 پیام جدید در کل"
+#. / 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:234
+msgid "On %s:"
+msgstr "در %s:"
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- پیام ارسال مجدد شده ----------"
 
-#: ../../src/client/views/conversation-viewer.vala:246
-#, c-format
-msgid "%u conversations selected."
-msgstr "%u پیام انتخاب شده است."
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "از: %s\n"
 
-#: ../../src/client/views/conversation-viewer.vala:743
-#, c-format
-msgid "%u read messages"
-msgstr "%u پیام خوانده شده"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "موضوع: %s\n"
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "تاریخ: %s\n"
 
-#: ../../src/client/util/util-email.vala:30
-msgid "(no subject)"
-msgstr "(بدون موضوع)"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "به: %s\n"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- پیام ارسال مجدد شده ----------"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Cc: %s\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:211
-msgid "1 month back"
-msgstr "1 ماه قبل"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "هیچکدام"
 
-#: ../../src/client/accounts/add-edit-page.vala:214
-msgid "1 year back"
-msgstr "1 سال قبل"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "نرم افزار ایمیل"
 
-#: ../../src/client/accounts/add-edit-page.vala:210
-msgid "2 weeks back"
-msgstr "2 هفته قبل"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:212
-msgid "3 months back"
-msgstr "3 ماه قبل"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "از وبسایت Yorba دیدن فرمایید"
 
-#: ../../src/client/accounts/add-edit-page.vala:213
-msgid "6 months back"
-msgstr "6 ماه قبل"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
+#: ../src/client/application/geary-controller.vala:62
+msgid "Delete conversation (Shift+Delete)"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">آیا از حذف این حساب اطمینان دارید؟</"
-"span> "
 
-#: ../../ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#: ../src/client/application/geary-controller.vala:63
+msgid "Delete conversations (Shift+Delete)"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">امکان حذف حساب وجود ندارد</span> "
 
-#: ../../ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr ""
-"یک پنجره‌ی ارسال ایمیل مربوط به این حساب در حال حاضر باز است. ابتدا پیام را "
-"ارسال یا از آن صرف نظر کرده و مجدداً تلاش نمایید."
 
-#: ../../src/client/geary-controller.vala:1491
-#, c-format
-msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr "فایلی با نام « %s » وجود دارد. آیا می‌خواهید بر روی آن ذخیره کنید؟"
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:245
-msgid "A_ccounts"
-msgstr "حساب ها"
+#: ../src/client/application/geary-controller.vala:72
+msgid "_Archive"
+msgstr "بایگانی"
 
-#: ../../src/client/geary-controller.vala:1227
-#, c-format
-msgid "About %s"
-msgstr "درباره‌ی %s"
+#: ../src/client/application/geary-controller.vala:73
+msgid "Archive conversation (A)"
+msgstr ""
 
-#: ../../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "حساب ها"
+#: ../src/client/application/geary-controller.vala:74
+msgid "Archive conversations (A)"
+msgstr ""
 
-#: ../../ui/account_list.glade:71
-msgid "Add account"
-msgstr "افزودن حساب"
+#: ../src/client/application/geary-controller.vala:77
+msgid "Mark as S_pam"
+msgstr "نشان گذاری به عنوان هرزنامه"
 
-#: ../../src/client/geary-controller.vala:304
-msgid "Add label"
-msgstr "افزودن برچسب"
+#: ../src/client/application/geary-controller.vala:78
+msgid "Mark as not S_pam"
+msgstr "نشان گذاری به عنوان غیر هرزنامه"
+
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
+msgid "Mark conversation"
+msgstr "نشان گذاری گفتگو"
 
-#: ../../src/client/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:81
+msgid "Mark conversations"
+msgstr "نشان گذاری گفتگوها"
+
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "افزودن برچسب به گفتگو"
 
-#: ../../src/client/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "افزودن برچسب به گفتگوها"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "همه‌ی ایمیل‌ها"
-
-#: ../../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 ""
-"همه‌ی ایمیل‌های مربوط به این حساب از روی کامپیوتر شما حذف خواهند شد. این "
-"عملیات بر ایمیل‌های روی سرور تأثیری نخواهد داشت."
-
-#: ../../src/client/geary-args.vala:24
-msgid "Allow inspection of WebView"
-msgstr "اجازه‌ی بازرسی از WebView"
-
-#: ../../src/client/views/conversation-viewer.vala:509
-msgid "Always Show From Sender"
-msgstr "همیشه ارسالی‌های این فرستنده را نشان بده"
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
+msgid "Move conversation"
+msgstr "انتقال گفتگو"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "بایگانی"
+#: ../src/client/application/geary-controller.vala:85
+msgid "Move conversations"
+msgstr "انتقال گفتگوها"
 
-#: ../../src/client/geary-controller.vala:48
-msgid "Archive conversation (Delete, Backspace, A)"
-msgstr "بایگانی کردن گفتگو (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:372
+msgid "A_ccounts"
+msgstr "حساب ها"
 
-#: ../../src/client/geary-controller.vala:49
-msgid "Archive conversations (Delete, Backspace, A)"
-msgstr "بایگانی کردن گفتگوها (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:377
+#: ../src/client/components/stock.vala:27
+msgid "_Preferences"
+msgstr "تنظیمات"
 
-#: ../../src/client/geary-controller.vala:1477
-#, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr "آیا می‌خواهید « %s » را باز کنید؟"
+#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/components/stock.vala:25
+msgid "_Help"
+msgstr "کمک"
 
-#: ../../src/client/geary-controller.vala:1478
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
-msgstr ""
-"فایل‌های پیوست شده در صورت باز شدن، ممکن است به سیستم شما صدمه بزنند. تنها "
-"فایل‌هایی که از منابع قابل اطمینان ارسال شده‌اند را باز کنید."
+#: ../src/client/application/geary-controller.vala:385
+#: ../src/client/components/stock.vala:21
+msgid "_About"
+msgstr "درباره"
 
-#: ../../src/client/views/conversation-viewer.vala:614
-msgid "Bcc:"
-msgstr "Bcc:"
+#: ../src/client/application/geary-controller.vala:389
+#: ../src/client/components/stock.vala:29
+msgid "_Quit"
+msgstr "خروج"
 
-#: ../../ui/composer.glade:113
-msgid "Bold (Ctrl+B)"
-msgstr "پر رنگ (Ctrl+B)"
+#: ../src/client/application/geary-controller.vala:394
+msgid "_Mark as..."
+msgstr "نشان گذاری به عنوان..."
 
-#: ../../ui/composer.glade:69
-msgid "C_olor"
-msgstr "رنگ متن"
+#: ../src/client/application/geary-controller.vala:400
+msgid "Mark as _Read"
+msgstr "نشان گذاری به عنوان خوانده شده"
 
-#: ../../src/client/composer/composer-window.vala:926
-msgid "Cannot add attachment"
-msgstr "امکان افزودن فایل پیوست وجود ندارد."
+#: ../src/client/application/geary-controller.vala:406
+msgid "Mark as _Unread"
+msgstr "نشان گذاری به عنوان خوانده نشده"
 
-#: ../../src/client/views/conversation-viewer.vala:611
-msgid "Cc:"
-msgstr "Cc:"
+#: ../src/client/application/geary-controller.vala:412
+msgid "_Star"
+msgstr "ستاره دار کردن"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Cc: %s\n"
+#: ../src/client/application/geary-controller.vala:417
+msgid "U_nstar"
+msgstr "حذف ستاره"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "یک فایل را انتخاب کنید"
+#: ../src/client/application/geary-controller.vala:427
+msgid "Add label"
+msgstr "افزودن برچسب"
 
-#: ../../src/client/geary-controller.vala:553
-msgid "Co_ntinue"
-msgstr "ادامه"
+#: ../src/client/application/geary-controller.vala:428
+msgid "_Label"
+msgstr "برچسب"
 
-#: ../../src/client/geary-application.vala:29
-msgid "Compose Message"
-msgstr "ارسال ایمیل"
+#: ../src/client/application/geary-controller.vala:432
+msgid "_Move"
+msgstr "انتقال"
 
-#: ../../src/client/geary-controller.vala:313
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "ارسال ایمیل جدید (Ctrl+N, N)"
 
-#: ../../ui/preferences.glade:117
-msgid "Composer"
-msgstr "ارسال کننده"
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
+msgid "_Reply"
+msgstr "پاسخ دادن"
 
-#: ../../src/client/views/conversation-viewer.vala:897
-msgid "Copy _Email Address"
-msgstr "کپی کردن آدرس ایمیل"
+#: ../src/client/application/geary-controller.vala:441
+msgid "Reply (Ctrl+R, R)"
+msgstr "پاسخ دادن (Ctrl+R, R)"
 
-#: ../../src/client/views/conversation-viewer.vala:902
-msgid "Copy _Link"
-msgstr "کپی کردن پیوند"
+#: ../src/client/application/geary-controller.vala:445
+msgid "R_eply All"
+msgstr "پاسخ به همه"
 
-#: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr "حق کپی از 2011 تا 2013 برای بنیاد Yorba محفوظ است"
+#: ../src/client/application/geary-controller.vala:446
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+msgstr "پاسخ دادن به همه (Ctrl+Shift+R, Shift+R)"
 
-#: ../../ui/composer.glade:21
-msgid "Cu_t"
-msgstr "برش"
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
+msgid "_Forward"
+msgstr "ارسال مجدد"
 
-#: ../../src/client/views/conversation-viewer.vala:620
-msgid "Date:"
-msgstr "تاریخ:"
+#: ../src/client/application/geary-controller.vala:452
+msgid "Forward (Ctrl+L, F)"
+msgstr "ارسال مجدد به دیگری (Ctrl+L, F)"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "تاریخ: %s\n"
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:43
-msgid "Delete conversation (Delete, Backspace, A)"
-msgstr "حذف گفتگو (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:44
-msgid "Delete conversations (Delete, Backspace, A)"
-msgstr "حذف گفتگوها (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:25
-msgid "Display program version"
-msgstr "نمایش نگارش برنامه"
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:663
-msgid "Do you want to discard the unsaved message?"
-msgstr "آیا می‌خواهید از پیام ذخیره نشده صرف نظر کنید؟"
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:666
-msgid "Do you want to discard this message?"
-msgstr "آیا می‌خواهید از این پیام صرف نظر کنید؟"
+#: ../src/client/application/geary-controller.vala:746
+msgid "Unable to store server trust exception"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:1479
-msgid "Don't _ask me again"
-msgstr "دیگر از من نپرس"
+#: ../src/client/application/geary-controller.vala:983
+msgid "Your settings are insecure"
+msgstr "تنظیمات شما ایمن نمی‌باشند."
 
-#: ../../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "چرک نویس‌ها"
+#: ../src/client/application/geary-controller.vala:984
+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 ""
+"تنظیمات IMAP و یا SMTP شما از SSL یا TLS پشتیبانی نمی‌کند. این بدین معنا است "
+"که نام کاربری و کلمه‌ی عبور شما توسط شخص دیگری بر روی شبکه قابل خواندن است. "
+"آیا از انجام این کار اطمینان دارید؟"
 
-#: ../../ui/composer.glade:419
-msgid "Drop files here"
-msgstr "فایل‌ها را اینجا رها کنید"
+#: ../src/client/application/geary-controller.vala:985
+msgid "Co_ntinue"
+msgstr "ادامه"
 
-#: ../../ui/login.glade:115
-msgid "E_mail address:"
-msgstr "آدرس ایمیل:"
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/components/status-bar.vala:29
+msgid "Error sending email"
+msgstr "خطا در ارسال ایمیل"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "E_xit"
-msgstr "خروج"
+#: ../src/client/application/geary-controller.vala:1064
+msgid ""
+"Geary encountered an error sending an email.  If the problem persists, "
+"please manually delete the email from your Outbox folder."
+msgstr ""
+"Geary در هنگام ارسال یک ایمیل با خطا مواجه شد. اگر مشکل همچنان ادامه دارد، "
+"لطفاً ایمیل را به صورت دستی از صندوق خروجی حذف نمایید."
 
-#: ../../src/client/views/conversation-viewer.vala:533
-msgid "Edit Draft"
-msgstr "ویرایش چرک نویس"
+#: ../src/client/application/geary-controller.vala:1068
+#: ../src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
+msgstr ""
 
-#: ../../ui/account_list.glade:84
-msgid "Edit account"
-msgstr "ویرایش حساب"
+#: ../src/client/application/geary-controller.vala:1069
+msgid ""
+"Geary encountered an error saving a sent message to Sent Mail.  The message "
+"will stay in your Outbox folder until you delete it."
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:94
-msgid "Email address:"
-msgstr "آدرس ایمیل:"
+#: ../src/client/application/geary-controller.vala:1138
+msgid "Labels"
+msgstr "برچسب‌ها"
 
-#: ../../src/client/geary-application.vala:28
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Mail;"
+#: ../src/client/application/geary-controller.vala:1150
+msgid "Unable to open the database for %s"
+msgstr "امکان باز کردن پایگاه داده برای %s وجود ندارد."
 
-#: ../../ui/preferences.glade:131
-msgid "Enable _spell checking"
-msgstr "فعال کردن غلط یاب"
+#: ../src/client/application/geary-controller.vala:1151
+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 ""
+"خطایی در هنگام باز کردن پایگاه داده‌ی محلی ایمیل برای این حساب وجود دارد. "
+"این احتمالاً به خاطر وجود خرابی در فایل پایگاه داده در پوشه‌ی زیر است:\n"
+"\n"
+"%s\n"
+"\n"
+"Geary می‌تواند پایگاه داده را مجدداً تولید کرده و مجدداً با سرور هماهنگ کند "
+"و یا خارج شود.\n"
+"\n"
+"ایجاد مجدد پایگاه داده باعث از بین رفتن همه‌ی ایمیل‌های محلی و فایل‌های "
+"پیوست آن‌ها خواهد شد.\n"
+"<b>ایمیل‌ها بر روی سرور شما تأثیری نخواهند دید.</b>"
 
-#: ../../ui/login.glade:588
-msgid "Encr_yption:"
-msgstr "رمزنگاری:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "_Rebuild"
+msgstr "بازسازی"
 
-#: ../../ui/login.glade:607
-msgid "Encrypt_ion:"
-msgstr "رمزنگاری:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "E_xit"
+msgstr "خروج"
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-msgid "Enter your account information to get started."
-msgstr "اطلاعات حساب خود را برای شروع وارد کنید."
+#: ../src/client/application/geary-controller.vala:1162
+msgid "Unable to rebuild database for \"%s\""
+msgstr "امکان ایجاد مجدد پایگاه داده برای « %s » وجود ندارد."
 
-#: ../../src/client/geary-controller.vala:714
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -529,1017 +520,1256 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../src/client/composer/composer-window.vala:43
-msgid "Error saving"
-msgstr "خطا در ذخیره سازی"
-
-#. / 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 "خطا در ارسال ایمیل"
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
+msgid "Unable to open local mailbox for %s"
+msgstr "امکان باز کردن صندوق پستی محلی برای %s وجود ندارد."
 
-#: ../../src/client/accounts/add-edit-page.vala:216
-msgid "Everything"
-msgstr "همه چیز"
+#: ../src/client/application/geary-controller.vala:1186
+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 ""
+"خطایی در هنگام باز کردن پایگاه داده‌ی محلی ایمیل برای این حساب وجود دارد. "
+"این احتمالاً به خاطر مشکلات دسترسی‌های فایل است.\n"
+"\n"
+"لطفاً بررسی کنید که آیا شما اجازه‌ی خواندن و نوشتن برای تمام فایل‌های این "
+"پوشه را دارید یا خیر:\n"
+"\n"
+"%s"
 
-#: ../../src/client/views/conversation-viewer.vala:1897
-msgid "Failed to open default text editor."
-msgstr "امکان باز کردن ویرایشگر متن پیش فرض وجود ندارد."
+#: ../src/client/application/geary-controller.vala:1196
+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 ""
+"شماره‌ی نگارش پایگاه داده‌ی محلی ایمیل برای نگارش جدیدتر Geary فرمت بندی شده "
+"است. متأسفانه، امکان بازگرداندن پایگاه داده به فرمت قدیمی برای خواند شدن "
+"توسط این نگارش از Geary وجود ندارد.\n"
+"\n"
+"لطفاً آخرین نگارش از Geary را نصب کرده و مجدداً تلاش نمایید."
 
-#: ../../src/client/geary-args.vala:54
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "امکان خواندن این تنظیمات از خط فرمان وجود ندارد: %s\n"
+#: ../src/client/application/geary-controller.vala:1207
+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 ""
+"خطایی در هنگام باز کردن حساب محلی وجود دارد. این احتمالاً به خاطر مشکلات "
+"ارتباطی است.\n"
+"\n"
+"لطفاً ارتباط شبکه‌ی خود را بررسی نموده و Geary را مجدداً اجرا نمایید."
 
-#. / 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 "نام و نام خانوادگی"
+#: ../src/client/application/geary-controller.vala:1715
+msgid "About %s"
+msgstr "درباره‌ی %s"
 
-#: ../../ui/composer.glade:182
-msgid "Fixed Width"
-msgstr "Fixed Width"
+#. / 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-controller.vala:1718
+msgid "translator-credits"
+msgstr ""
+"Hessam Shahpouri <h shahpouri yandex com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Hessam Shahpouri https://launchpad.net/~hessam-08";
 
-#: ../../src/client/geary-controller.vala:329
-msgid "Forward (Ctrl+L, F)"
-msgstr "ارسال مجدد به دیگری (Ctrl+L, F)"
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:605
-msgid "From:"
-msgstr "از:"
+#: ../src/client/application/geary-controller.vala:1986
+msgid "Are you sure you want to open \"%s\"?"
+msgstr "آیا می‌خواهید « %s » را باز کنید؟"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "از: %s\n"
+#: ../src/client/application/geary-controller.vala:1987
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
+"فایل‌های پیوست شده در صورت باز شدن، ممکن است به سیستم شما صدمه بزنند. تنها "
+"فایل‌هایی که از منابع قابل اطمینان ارسال شده‌اند را باز کنید."
 
-#: ../../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "گیگابایت"
+#: ../src/client/application/geary-controller.vala:1988
+msgid "Don't _ask me again"
+msgstr "دیگر از من نپرس"
 
-#: ../../src/client/geary-application.vala:25
-msgid "Geary Mail"
-msgstr "Geary Mail"
+#: ../src/client/application/geary-controller.vala:2006
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr "فایلی با نام « %s » وجود دارد. آیا می‌خواهید بر روی آن ذخیره کنید؟"
 
-#: ../../src/client/geary-controller.vala:626
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
-"Geary در هنگام ارسال یک ایمیل با خطا مواجه شد. اگر مشکل همچنان ادامه دارد، "
-"لطفاً ایمیل را به صورت دستی از صندوق خروجی حذف نمایید."
+"این فایل در « %s » وجود دارد. نوشت بر روی آن باعث بازنویسی محتوای آن خواهد "
+"شد."
 
-#: ../../ui/password-dialog.glade:315
-msgid "General"
-msgstr "عمومی"
+#: ../src/client/application/geary-controller.vala:2011
+msgid "_Replace"
+msgstr "جایگذاری"
 
-#: ../../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "جی میل (ایمیل گوگل)"
+#: ../src/client/application/geary-controller.vala:2309
+msgid "Close open draft messages?"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:133
-msgid "IMAP Credentials"
-msgstr "اعتبار نامه‌ی IMAP"
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
 
-#: ../../ui/login.glade:572
-msgid "IMAP password"
-msgstr "کلمه‌ی عبور IMAP"
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
 
-#: ../../ui/login.glade:286 ../../ui/password-dialog.glade:334
-msgid "IMAP settings"
-msgstr "تنظیمات IMAP"
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
+msgstr ""
 
-#: ../../ui/login.glade:556
-msgid "IMAP username"
-msgstr "نام کاربری IMAP"
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "با اهمیت"
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "صندوق ورودی"
+#: ../src/client/application/geary-controller.vala:2489
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "صندوق‌های ورودی"
+#: ../src/client/application/geary-controller.vala:2491
+msgid "Delete"
+msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:163
-#, c-format
-msgid "Indexing %s account"
-msgstr "فهرست کردن %s حساب"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
+msgstr ""
 
-#: ../../ui/composer.glade:120
-msgid "Italic (Ctrl+I)"
-msgstr "کج نویس (Ctrl+I)"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "کیلوبایت"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:689
-msgid "Labels"
-msgstr "برچسب‌ها"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr ""
 
-#: ../../ui/composer.glade:151
-msgid "Lar_ge"
-msgstr "بزرگ"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "اطلاعات رفع عیب خروجی"
 
-#: ../../ui/composer.glade:152
-msgid "Large"
-msgstr "بزرگ"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "ثبت مشاهدات گفتگوها"
 
-#: ../../ui/composer.glade:62
-msgid "Link (Ctrl+L)"
-msgstr "ایجاد پیوند (Ctrl+L)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "ثبت درخواست‌ها و پاسخ‌های شبکه"
+
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "ثبت فعالیت‌های شبکه"
 
 #. / 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
+#: ../src/client/application/geary-args.vala:17
 msgid "Log IMAP replay queue"
 msgstr "ثبت سلسله تغییرات IMAP"
 
-#: ../../src/client/geary-args.vala:11
-msgid "Log conversation monitoring"
-msgstr "ثبت مشاهدات گفتگوها"
+#. / 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 "ثبت سری سازی درخواست‌ها و پاسخ‌های شبکه"
 
-#: ../../src/client/geary-args.vala:21
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "ثبت فعالیت‌های دوره‌ای"
+
+#: ../src/client/application/geary-args.vala:22
 msgid "Log database queries (generates lots of messages)"
 msgstr "ثبت درخواست‌های پایگاه داده (پیام‌های زیادی تولید خواهد کرد)"
 
 #. / "Normalization" can also be called "synchronization"
-#: ../../src/client/geary-args.vala:23
+#: ../src/client/application/geary-args.vala:24
 msgid "Log folder normalization"
 msgstr "ثبت هماهنگ سازی پوشه‌ها"
 
-#: ../../src/client/geary-args.vala:13
-msgid "Log network activity"
-msgstr "ثبت فعالیت‌های شبکه"
-
-#: ../../src/client/geary-args.vala:12
-msgid "Log network deserialization"
-msgstr "ثبت درخواست‌ها و پاسخ‌های شبکه"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "اجازه‌ی بازرسی از WebView"
 
-#. / 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 "ثبت سری سازی درخواست‌ها و پاسخ‌های شبکه"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:20
-msgid "Log periodic activity"
-msgstr "ثبت فعالیت‌های دوره‌ای"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "نمایش نگارش برنامه"
 
-#: ../../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "مگابایت"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr ""
 
-#: ../../src/client/geary-application.vala:26
-msgid "Mail Client"
-msgstr "نرم افزار ایمیل"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "لطفاً نظرات، پیشنهادات خود و خطاهای برنامه را برای ما ارسال کنید:"
 
-#: ../../src/client/views/conversation-viewer.vala:1479
-msgid "Mark Unread From _Here"
-msgstr "نشان گذاری به عنوان خوانده نشده از اینجا"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "امکان خواندن این تنظیمات از خط فرمان وجود ندارد: %s\n"
 
-#: ../../src/client/geary-controller.vala:52
-msgid "Mark as S_pam"
-msgstr "نشان گذاری به عنوان هرزنامه"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "تنظیمات خط فرمان « %s » قابل شناسایی نیست\n"
 
-#: ../../src/client/geary-controller.vala:277
-msgid "Mark as _Read"
-msgstr "نشان گذاری به عنوان خوانده شده"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - پیام جدید"
 
-#: ../../src/client/geary-controller.vala:283
-msgid "Mark as _Unread"
-msgstr "نشان گذاری به عنوان خوانده نشده"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d پیام جدید"
 
-#: ../../src/client/geary-controller.vala:53
-msgid "Mark as not S_pam"
-msgstr "نشان گذاری به عنوان غیر هرزنامه"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d پیام جدید در کل"
 
-#: ../../src/client/geary-controller.vala:55
-#: ../../src/client/geary-controller.vala:269
-msgid "Mark conversation"
-msgstr "نشان گذاری گفتگو"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d پیام جدید دیگر برای %s)"
 
-#: ../../src/client/geary-controller.vala:56
-msgid "Mark conversations"
-msgstr "نشان گذاری گفتگوها"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "باز کردن"
 
-#: ../../src/client/views/formatted-conversation-data.vala:11
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "من"
 
-#: ../../ui/composer.glade:158
-msgid "Medium"
-msgstr "متوسط"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr ""
 
-#: ../../ui/composer.glade:75
-msgid "More options"
-msgstr "گزینه‌های بیشتر"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:59
-#: ../../src/client/geary-controller.vala:308
-msgid "Move conversation"
-msgstr "انتقال گفتگو"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:60
-msgid "Move conversations"
-msgstr "انتقال گفتگوها"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
 
-#: ../../ui/login.glade:176
-msgid "N_ame:"
-msgstr "نام:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr ""
 
-#: ../../ui/login.glade:230
-msgid "N_ickname:"
-msgstr "نام حساب:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "ارسال ایمیل جدید"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:80
-msgid "Nickname:"
-msgstr "نام حساب:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
 
-#: ../../ui/login.glade:661
-msgid "No authentication re_quired"
-msgstr "نیازی به تصدیق نمی‌باشد"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:275
-msgid "No conversations in folder."
-msgstr "هیچ گفتگویی در این پوشه نیست."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:244
-msgid "No conversations selected."
-msgstr "هیچ گفتگویی انتخاب نشده است."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:273
-msgid "No search results found."
-msgstr "هیچ نتیجه‌ای برای جستجو پیدا نشد."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:128
-#: ../../src/engine/api/geary-special-folder-type.vala:58
-msgid "None"
-msgstr "هیچکدام"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr ""
+
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr ""
+
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "یک فایل را انتخاب کنید"
+
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "پیوست"
+
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr ""
+
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "حساب ها"
+
+#. / 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 "نام و نام خانوادگی"
+
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "به Geary خوش آمدید."
+
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "اطلاعات حساب خود را برای شروع وارد کنید."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 هفته قبل"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 ماه قبل"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 ماه قبل"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 ماه قبل"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 سال قبل"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "همه چیز"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "یادآوری کلمه‌های عبور"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "یادآوری کلمه‌ی عبور"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "قادر به اعتبار سنجی نیست:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; لقب (Nickname) نادرست برای حساب کاربری.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; آدرس ایمیل در حال حاظر به Geary افزوده شده است.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; خطا در ارتباط IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; نام کاربری و کلمه عبور نادرست برای IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; خطای ارتباط SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; نام کاربری و کلمه عبور نادرست برای SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; خطا در ارتباط.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; نام کاربری و کلمه عبور نادرست.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "ذخیره"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "افزودن"
+
+#. / 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 "%l:%M %P"
 
-#: ../../ui/preferences.glade:158
-msgid "Notifications"
-msgstr "هشدارها"
+#. / 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"
 
-#: ../../src/client/util/util-date.vala:164
+#. / 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 "%B %-e, %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 "%B %-e, %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 "%B %-e, %Y %-l:%M %P"
+
+#: ../src/client/util/util-date.vala:164
 msgid "Now"
 msgstr "اکنون"
 
-#. / 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 "در %1$s, %2$s نوشته بود:"
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#. / 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 "در %s:"
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "باز کردن"
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "دیروز"
 
-#: ../../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "موارد دیگر"
+#. / 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
+msgid "%A"
+msgstr "%A"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "صندوق خروجی"
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "بایت"
 
-#: ../../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "اوت لوک (مایکروسافت)"
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "ترابایت"
 
-#: ../../src/client/geary-args.vala:10
-msgid "Output debugging information"
-msgstr "اطلاعات رفع عیب خروجی"
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "گیگابایت"
 
-#: ../../ui/login.glade:337
-msgid "P_ort:"
-msgstr "پورت:"
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "مگابایت"
 
-#: ../../ui/login.glade:474
-msgid "Pass_word:"
-msgstr "کلمه عبور:"
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "کیلوبایت"
 
-#: ../../ui/login.glade:101
-msgid "Password"
-msgstr "کلمه‌ی عبور"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d پیام"
 
-#: ../../ui/password-dialog.glade:196
-msgid "Password:"
-msgstr "کلمه عبور:"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d خوانده نشده"
 
-#: ../../ui/composer.glade:102
-msgid "Paste _With Formatting"
-msgstr "چسباندن با حفظ فرمت بندی"
+#. / 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
+msgid "%s, %s"
+msgstr "%s / %s"
 
-#: ../../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your email password"
-msgstr "لطفاً کلمه‌ی عبور ایمیل خود را وارد کنید"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "صندوق‌های ورودی"
 
-#: ../../src/client/geary-args.vala:47
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "لطفاً نظرات، پیشنهادات خود و خطاهای برنامه را برای ما ارسال کنید:"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "جستجو در حساب %s"
 
-#: ../../ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
-msgstr "لطفا منتظر بمانید تا Geary اعتبار حساب شما را تأیید نمایید."
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:421
-msgid "Por_t:"
-msgstr "پورت:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "هیچ گفتگویی انتخاب نشده است."
 
-#: ../../ui/password-dialog.glade:367 ../../ui/password-dialog.glade:470
-msgid "Port:"
-msgstr "پورت:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:81
-msgid "Quote text  (Ctrl+])"
-msgstr "نقل قول کردن متن (Ctrl+])"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
+msgstr "هیچ نتیجه‌ای برای جستجو پیدا نشد."
 
-#: ../../src/client/geary-controller.vala:322
-msgid "R_eply All"
-msgstr "پاسخ به همه"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
+msgstr "هیچ گفتگویی در این پوشه نیست."
 
-#: ../../ui/preferences.glade:55
-msgid "Reading"
-msgstr "خواندن"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
+msgstr "این ایمیل حاوی عکس‌هایی در سرورهای دیگر است."
 
-#: ../../ui/password-dialog.glade:274
-msgid "Real name:"
-msgstr "نام حقیقی:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr "نمایش تصاویر"
 
-#: ../../src/client/accounts/add-edit-page.vala:590
-msgid "Remem_ber password"
-msgstr "یادآوری کلمه‌ی عبور"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
+msgstr "همیشه ارسالی‌های این فرستنده را نشان بده"
 
-#: ../../src/client/accounts/add-edit-page.vala:583
-msgid "Remem_ber passwords"
-msgstr "یادآوری کلمه‌های عبور"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
+msgstr "ویرایش چرک نویس"
 
-#: ../../ui/account_list.glade:97
-msgid "Remove account"
-msgstr "حذف حساب"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "از:"
 
-#: ../../ui/composer.glade:95
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "حذف فرمت بندی (Ctrl+Space)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "به:"
 
-#: ../../src/client/geary-controller.vala:318
-msgid "Reply (Ctrl+R, R)"
-msgstr "پاسخ دادن (Ctrl+R, R)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Cc:"
 
-#: ../../src/client/geary-controller.vala:323
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
-msgstr "پاسخ دادن به همه (Ctrl+Shift+R, Shift+R)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Bcc:"
 
-#: ../../src/client/views/conversation-viewer.vala:1452
-msgid "Reply to _All"
-msgstr "پاسخ به همه"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "موضوع:"
 
-#: ../../ui/password-dialog.glade:163
-msgid "SMTP Credentials"
-msgstr "اعتبار نامه‌ی SMTP"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "تاریخ:"
 
-#: ../../ui/login.glade:507
-msgid "SMTP password"
-msgstr "کلمه‌ی عبور SMTP"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:439 ../../ui/password-dialog.glade:437
-msgid "SMTP settings"
-msgstr "تنظیمات SMTP"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "کپی"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "کپی کردن آدرس ایمیل"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "کپی کردن پیوند"
 
-#: ../../ui/login.glade:491
-msgid "SMTP username"
-msgstr "نام کاربری SMTP"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
+msgstr "انتخاب پیام"
 
-#: ../../src/client/dialogs/password-dialog.vala:124
-msgid "SSL"
-msgstr "SSL"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "انتخاب همه"
 
-#: ../../ui/password-dialog.glade:382 ../../ui/password-dialog.glade:485
-msgid "SSL/TLS encryption:"
-msgstr "رمزنگاری SSL/TLS:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "بازرسی"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr "به نظر می‌رسد این پیوند برای رفتن به"
 
-#: ../../src/client/dialogs/password-dialog.vala:126
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
+msgstr "می‌باشد، اما در اصل می‌رود به"
 
-#: ../../ui/composer.glade:169
-msgid "S_ans Serif"
-msgstr "فونت Sans Serif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
+msgstr " (نامعتبر؟)"
 
-#: ../../ui/composer.glade:175
-msgid "S_erif"
-msgstr "فونت Serif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
+msgstr "ذخیره‌ی عکس با عنوان..."
 
-#: ../../ui/login.glade:160
-msgid "S_ervice:"
-msgstr "خدمت:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "ذخیره به عنوان..."
 
-#: ../../ui/composer.glade:170
-msgid "Sans Serif"
-msgstr "Sans Serif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "ذخیره همه پیوست‌ها..."
 
-#: ../../src/client/views/conversation-viewer.vala:1437
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
 msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] "ذخیره همه پیوست‌ها..."
 
-#: ../../src/client/views/conversation-viewer.vala:1400
-msgid "Save All A_ttachments..."
-msgstr "ذخیره همه پیوست‌ها..."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "پاسخ به همه"
 
-#: ../../src/client/composer/composer-window.vala:41
-msgid "Saved"
-msgstr "ذخیره شد"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "نشان گذاری به عنوان خوانده شده"
 
-#: ../../src/client/composer/composer-window.vala:42
-msgid "Saving"
-msgstr "در حال ذخیره سازی"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "نشان گذاری به عنوان خوانده نشده"
 
-#: ../../ui/login.glade:304
-msgid "Se_rver:"
-msgstr "خدمات دهنده:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
+msgstr "نشان گذاری به عنوان خوانده نشده از اینجا"
 
-#: ../../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 "جستجو"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "دیدن کد متن"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:39
-#: ../../src/client/ui/main-toolbar.vala:170
-#, c-format
-msgid "Search %s account"
-msgstr "جستجو در حساب %s"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "امکان باز کردن ویرایشگر متن پیش فرض وجود ندارد."
 
-#: ../../src/client/ui/main-toolbar.vala:76
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "یافتن همه‌ی ایمیل‌های حساب، حاوی کلمات کلیدی (Ctrl+S)"
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr "%s - بازرس گفتگوها"
 
-#: ../../src/client/composer/composer-window.vala:1243
-msgid "Select Color"
-msgstr "انتخاب رنگ"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "ذخیره شد"
 
-#: ../../src/client/ui/stock.vala:32
-#: ../../src/client/views/conversation-viewer.vala:916
-msgid "Select _All"
-msgstr "انتخاب همه"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "در حال ذخیره سازی"
 
-#: ../../src/client/views/conversation-viewer.vala:910
-msgid "Select _Message"
-msgstr "انتخاب پیام"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "خطا در ذخیره سازی"
 
-#: ../../src/client/geary-application.vala:27
-msgid "Send and receive email"
-msgstr "ارسال و دریافت ایمیل‌ها"
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:747
-msgid "Send message with an empty body?"
-msgstr "ایمیل، بدون متن ارسال شود؟"
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "ارسال ایمیل جدید"
+
+#: ../src/client/composer/composer-widget.vala:138
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:743
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "آیا می‌خواهید از این پیام صرف نظر کنید؟"
+
+#: ../src/client/composer/composer-widget.vala:1262
 msgid "Send message with an empty subject and body?"
 msgstr "ایمیل، بدون موضوع و متن ارسال شود؟"
 
-#: ../../src/client/composer/composer-window.vala:745
+#: ../src/client/composer/composer-widget.vala:1264
 msgid "Send message with an empty subject?"
 msgstr "ایمیل، بدون موضوع ارسال شود؟"
 
-#: ../../src/client/composer/composer-window.vala:749
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "ایمیل، بدون متن ارسال شود؟"
+
+#: ../src/client/composer/composer-widget.vala:1268
 msgid "Send message without an attachment?"
 msgstr "ایمیل، بدون فایل پیوست ارسال شود؟"
 
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "امکان افزودن فایل پیوست وجود ندارد."
+
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "فایل « %s » پیدا نشد."
+
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "« %s » یک پوشه است."
+
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "فایل « %s » خالی است."
+
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "امکان باز کردن فایل « %s » برای خواندن آن وجود ندارد."
+
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "فایل « %s » در حال حاظر برای تحویل پیوست شده است."
+
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "انتخاب رنگ"
+
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr ""
+
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr ""
+
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../../src/client/ui/status-bar.vala:25
+#: ../src/client/components/status-bar.vala:26
 msgid "Sending..."
 msgstr "در حال ارسال..."
 
-#: ../../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "ایمیل‌های ارسال شده"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:404
-msgid "Ser_ver:"
-msgstr "خدمات دهنده:"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:176
-msgid "Serif"
-msgstr "Serif"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "پیدا نشد"
 
-#: ../../ui/password-dialog.glade:352 ../../ui/password-dialog.glade:455
-msgid "Server:"
-msgstr "خدمات دهنده:"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "تأیید"
 
-#: ../../ui/password-dialog.glade:259
-msgid "Service:"
-msgstr "خدمت:"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "انصراف"
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "Show Images"
-msgstr "نمایش تصاویر"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "بستن"
 
-#: ../../ui/preferences.glade:193
-msgid "Show _notifications for new mail"
-msgstr "نمایش هشدار برای ایمیل جدید"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "صرف نظر کردن"
 
-#: ../../ui/composer.glade:164
-msgid "Small"
-msgstr "کوچک"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "باز کردن"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "هرزنامه"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "چاپ..."
 
-#: ../../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "ستاره دار"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "حذف"
 
-#: ../../ui/login.glade:761
-msgid "Storage"
-msgstr "فضای ذخیره سازی"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "نگه داشتن"
 
-#: ../../ui/composer.glade:134
-msgid "Strikethrough (Ctrl+K)"
-msgstr "رو خط (Ctrl+K)"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "یافتن همه‌ی ایمیل‌های حساب، حاوی کلمات کلیدی (Ctrl+S)"
 
-#: ../../src/client/views/conversation-viewer.vala:617
-msgid "Subject:"
-msgstr "موضوع:"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "فهرست کردن %s حساب"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr "موضوع: %s\n"
+#~ msgid "%d results"
+#~ msgstr "%d مورد"
 
-#: ../../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "ترابایت"
+#~ msgid "%i matches"
+#~ msgstr "%i مورد مشابه"
 
-#: ../../src/client/geary-controller.vala:1493
-#, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr ""
-"این فایل در « %s » وجود دارد. نوشت بر روی آن باعث بازنویسی محتوای آن خواهد "
-"شد."
+#~ msgid "%i matches (wrapped)"
+#~ msgstr "%i مورد مشابه (کوتاه شده)"
 
-#: ../../src/client/geary-controller.vala:747
-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 ""
-"شماره‌ی نگارش پایگاه داده‌ی محلی ایمیل برای نگارش جدیدتر Geary فرمت بندی شده "
-"است. متأسفانه، امکان بازگرداندن پایگاه داده به فرمت قدیمی برای خواند شدن "
-"توسط این نگارش از Geary وجود ندارد.\n"
-"\n"
-"لطفاً آخرین نگارش از Geary را نصب کرده و مجدداً تلاش نمایید."
+#~ msgid "%u conversations selected."
+#~ msgstr "%u پیام انتخاب شده است."
 
-#: ../../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 ""
-"خطایی در هنگام باز کردن حساب محلی وجود دارد. این احتمالاً به خاطر مشکلات "
-"ارتباطی است.\n"
-"\n"
-"لطفاً ارتباط شبکه‌ی خود را بررسی نموده و Geary را مجدداً اجرا نمایید."
+#~ msgid "%u read messages"
+#~ msgstr "%u پیام خوانده شده"
 
-#: ../../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 ""
-"خطایی در هنگام باز کردن پایگاه داده‌ی محلی ایمیل برای این حساب وجود دارد. این "
-"احتمالاً به خاطر مشکلات دسترسی‌های فایل است.\n"
-"\n"
-"لطفاً بررسی کنید که آیا شما اجازه‌ی خواندن و نوشتن برای تمام فایل‌های این پوشه "
-"را دارید یا خیر:\n"
-"\n"
-"%s"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">آیا از حذف این حساب اطمینان "
+#~ "دارید؟</span> "
 
-#: ../../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 ""
-"خطایی در هنگام باز کردن پایگاه داده‌ی محلی ایمیل برای این حساب وجود دارد. این "
-"احتمالاً به خاطر وجود خرابی در فایل پایگاه داده در پوشه‌ی زیر است:\n"
-"\n"
-"%s\n"
-"\n"
-"Geary می‌تواند پایگاه داده را مجدداً تولید کرده و مجدداً با سرور هماهنگ کند و "
-"یا خارج شود.\n"
-"\n"
-"ایجاد مجدد پایگاه داده باعث از بین رفتن همه‌ی ایمیل‌های محلی و فایل‌های پیوست "
-"آن‌ها خواهد شد.\n"
-"<b>ایمیل‌ها بر روی سرور شما تأثیری نخواهند دید.</b>"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">امکان حذف حساب وجود ندارد</span> "
 
-#: ../../src/client/views/conversation-viewer.vala:1147
-msgid "This link appears to go to"
-msgstr "به نظر می‌رسد این پیوند برای رفتن به"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "یک پنجره‌ی ارسال ایمیل مربوط به این حساب در حال حاضر باز است. ابتدا پیام را "
+#~ "ارسال یا از آن صرف نظر کرده و مجدداً تلاش نمایید."
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "This message contains remote images."
-msgstr "این ایمیل حاوی عکس‌هایی در سرورهای دیگر است."
+#~ msgid "Add account"
+#~ msgstr "افزودن حساب"
 
-#: ../../ui/composer.glade:435
-msgid "To add them as attachments"
-msgstr "جهت افزودن آن‌ها به عنوان پیوست"
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "همه‌ی ایمیل‌های مربوط به این حساب از روی کامپیوتر شما حذف خواهند شد. این "
+#~ "عملیات بر ایمیل‌های روی سرور تأثیری نخواهد داشت."
 
-#: ../../src/client/views/conversation-viewer.vala:608
-msgid "To:"
-msgstr "به:"
+#~ msgid "Archive conversation (Delete, Backspace, A)"
+#~ msgstr "بایگانی کردن گفتگو (Delete, Backspace, A)"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "به: %s\n"
+#~ msgid "Archive conversations (Delete, Backspace, A)"
+#~ msgstr "بایگانی کردن گفتگوها (Delete, Backspace, A)"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "زباله دان"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "پر رنگ (Ctrl+B)"
 
-#: ../../src/client/geary-controller.vala:294
-msgid "U_nstar"
-msgstr "حذف ستاره"
+#~ msgid "C_olor"
+#~ msgstr "رنگ متن"
 
-#: ../../src/client/dialogs/password-dialog.vala:17
-msgid "Unable to login to email server"
-msgstr "امکان ورود به سرویس دهنده‌ی ایمیل وجود ندارد"
+#~ msgid "Compose Message"
+#~ msgstr "ارسال ایمیل"
 
-#: ../../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 "امکان باز کردن صندوق پستی محلی برای %s وجود ندارد."
+#~ msgid "Composer"
+#~ msgstr "ارسال کننده"
 
-#: ../../src/client/geary-controller.vala:701
-#, c-format
-msgid "Unable to open the database for %s"
-msgstr "امکان باز کردن پایگاه داده برای %s وجود ندارد."
+#~ msgid "Copyright 2011-2013 Yorba Foundation"
+#~ msgstr "حق کپی از 2011 تا 2013 برای بنیاد Yorba محفوظ است"
 
-#: ../../src/client/geary-controller.vala:713
-#, c-format
-msgid "Unable to rebuild database for \"%s\""
-msgstr "امکان ایجاد مجدد پایگاه داده برای « %s » وجود ندارد."
+#~ msgid "Cu_t"
+#~ msgstr "برش"
 
-#: ../../src/client/accounts/add-edit-page.vala:619
-msgid "Unable to validate:\n"
-msgstr "قادر به اعتبار سنجی نیست:\n"
+#~ msgid "Delete conversation (Delete, Backspace, A)"
+#~ msgstr "حذف گفتگو (Delete, Backspace, A)"
 
-#: ../../ui/composer.glade:127
-msgid "Underline (Ctrl+U)"
-msgstr "زیر خط (Ctrl+U)"
+#~ msgid "Delete conversations (Delete, Backspace, A)"
+#~ msgstr "حذف گفتگوها (Delete, Backspace, A)"
 
-#: ../../ui/composer.glade:88
-msgid "Unquote text (Ctrl+[)"
-msgstr "برداشتن نقل قول متن (Ctrl+[)"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "آیا می‌خواهید از پیام ذخیره نشده صرف نظر کنید؟"
 
-#: ../../src/client/geary-args.vala:65
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "تنظیمات خط فرمان « %s » قابل شناسایی نیست\n"
+#~ msgid "Drop files here"
+#~ msgstr "فایل‌ها را اینجا رها کنید"
 
-#: ../../ui/login.glade:457
-msgid "User_name:"
-msgstr "نام کاربری:"
+#~ msgid "E_mail address:"
+#~ msgstr "آدرس ایمیل:"
 
-#: ../../ui/password-dialog.glade:70 ../../ui/password-dialog.glade:181
-msgid "Username:"
-msgstr "نام کاربری:"
+#~ msgid "Edit account"
+#~ msgstr "ویرایش حساب"
 
-#: ../../src/client/geary-application.vala:19
-msgid "Visit the Yorba web site"
-msgstr "از وبسایت Yorba دیدن فرمایید"
+#~ msgid "Email address:"
+#~ msgstr "آدرس ایمیل:"
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-#, c-format
-msgid "Welcome to Geary."
-msgstr "به Geary خوش آمدید."
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Email;E-mail;Mail;"
 
-#: ../../ui/login.glade:252
-msgid "Work, Home, etc."
-msgstr "کار، منزل و غیره"
+#~ msgid "Enable _spell checking"
+#~ msgstr "فعال کردن غلط یاب"
 
-#: ../../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "ایمیل یاهو"
+#~ msgid "Encr_yption:"
+#~ msgstr "رمزنگاری:"
 
-#: ../../src/client/util/util-date.vala:177
-msgid "Yesterday"
-msgstr "دیروز"
+#~ msgid "Encrypt_ion:"
+#~ msgstr "رمزنگاری:"
 
-#: ../../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 ""
-"تنظیمات IMAP و یا SMTP شما از SSL یا TLS پشتیبانی نمی‌کند. این بدین معنا است "
-"که نام کاربری و کلمه‌ی عبور شما توسط شخص دیگری بر روی شبکه قابل خواندن است. "
-"آیا از انجام این کار اطمینان دارید؟"
+#~ msgid "Fixed Width"
+#~ msgstr "Fixed Width"
 
-#: ../../src/client/geary-controller.vala:551
-msgid "Your settings are insecure"
-msgstr "تنظیمات شما ایمن نمی‌باشند."
+#~ msgid "Geary Mail"
+#~ msgstr "Geary Mail"
 
-#: ../../src/client/geary-controller.vala:258
-#: ../../src/client/ui/stock.vala:21
-msgid "_About"
-msgstr "درباره"
+#~ msgid "General"
+#~ msgstr "عمومی"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:22
-msgid "_Add"
-msgstr "افزودن"
+#~ msgid "IMAP Credentials"
+#~ msgstr "اعتبار نامه‌ی IMAP"
 
-#: ../../src/client/geary-controller.vala:47
-msgid "_Archive"
-msgstr "بایگانی"
+#~ msgid "IMAP password"
+#~ msgstr "کلمه‌ی عبور IMAP"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "پیوست"
+#~ msgid "IMAP settings"
+#~ msgstr "تنظیمات IMAP"
 
-#: ../../ui/composer.glade:525
-msgid "_Attach File"
-msgstr "پیوست فایل"
+#~ msgid "IMAP username"
+#~ msgstr "نام کاربری IMAP"
 
-#: ../../ui/preferences.glade:69
-msgid "_Automatically select next message"
-msgstr "انتخاب پیام بعدی به طور خودکار"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "کج نویس (Ctrl+I)"
 
-#: ../../src/client/ui/stock.vala:19
-msgid "_Cancel"
-msgstr "انصراف"
+#~ msgid "Lar_ge"
+#~ msgstr "بزرگ"
 
-#: ../../ui/composer.glade:52
-msgid "_Center"
-msgstr "وسط چین"
+#~ msgid "Large"
+#~ msgstr "بزرگ"
 
-#: ../../src/client/ui/stock.vala:23
-msgid "_Close"
-msgstr "بستن"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "ایجاد پیوند (Ctrl+L)"
 
-#: ../../src/client/views/conversation-viewer.vala:889
-msgid "_Copy"
-msgstr "کپی"
+#~ msgid "Medium"
+#~ msgstr "متوسط"
 
-#: ../../src/client/geary-controller.vala:42
-msgid "_Delete"
-msgstr "حذف"
+#~ msgid "More options"
+#~ msgstr "گزینه‌های بیشتر"
 
-#: ../../ui/password-dialog.glade:548
-msgid "_Details"
-msgstr "جزئیات"
+#~ msgid "N_ame:"
+#~ msgstr "نام:"
 
-#: ../../src/client/ui/stock.vala:24
-msgid "_Discard"
-msgstr "صرف نظر کردن"
+#~ msgid "N_ickname:"
+#~ msgstr "نام حساب:"
 
-#: ../../ui/preferences.glade:90
-msgid "_Display conversation preview"
-msgstr "نشان دادن پیش نمایش گفتگو"
+#~ msgid "Nickname:"
+#~ msgstr "نام حساب:"
 
-#: ../../src/client/geary-controller.vala:262
-msgid "_Donate"
-msgstr "هدیه دادن"
+#~ msgid "No authentication re_quired"
+#~ msgstr "نیازی به تصدیق نمی‌باشد"
 
-#: ../../ui/login.glade:782
-msgid "_Download mail:"
-msgstr "دانلود ایمیل:"
+#~ msgid "Notifications"
+#~ msgstr "هشدارها"
 
-#: ../../ui/composer.glade:181
-msgid "_Fixed Width"
-msgstr "فونت Fixed Width"
+#~ msgid "P_ort:"
+#~ msgstr "پورت:"
 
-#: ../../src/client/geary-controller.vala:328
-#: ../../src/client/views/conversation-viewer.vala:1457
-msgid "_Forward"
-msgstr "ارسال مجدد"
+#~ msgid "Pass_word:"
+#~ msgstr "کلمه عبور:"
 
-#: ../../src/client/geary-controller.vala:254
-#: ../../src/client/ui/stock.vala:25
-msgid "_Help"
-msgstr "کمک"
+#~ msgid "Password"
+#~ msgstr "کلمه‌ی عبور"
 
-#: ../../ui/composer.glade:542
-msgid "_Include Original Attachments"
-msgstr "همراه کردن پیوست‌های اصلی"
+#~ msgid "Password:"
+#~ msgstr "کلمه عبور:"
 
-#: ../../src/client/views/conversation-viewer.vala:922
-msgid "_Inspect"
-msgstr "بازرسی"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "چسباندن با حفظ فرمت بندی"
 
-#: ../../ui/composer.glade:57
-msgid "_Justify"
-msgstr "کشیده"
+#~ msgid "Please enter your email password"
+#~ msgstr "لطفاً کلمه‌ی عبور ایمیل خود را وارد کنید"
 
-#: ../../src/client/ui/stock.vala:33
-msgid "_Keep"
-msgstr "نگه داشتن"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "لطفا منتظر بمانید تا Geary اعتبار حساب شما را تأیید نمایید."
 
-#: ../../src/client/geary-controller.vala:305
-msgid "_Label"
-msgstr "برچسب"
+#~ msgid "Por_t:"
+#~ msgstr "پورت:"
 
-#: ../../ui/composer.glade:42
-msgid "_Left"
-msgstr "چپ چین"
+#~ msgid "Port:"
+#~ msgstr "پورت:"
 
-#: ../../src/client/views/conversation-viewer.vala:1469
-msgid "_Mark as Read"
-msgstr "نشان گذاری به عنوان خوانده شده"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "نقل قول کردن متن (Ctrl+])"
 
-#: ../../src/client/views/conversation-viewer.vala:1473
-msgid "_Mark as Unread"
-msgstr "نشان گذاری به عنوان خوانده نشده"
+#~ msgid "Reading"
+#~ msgstr "خواندن"
 
-#: ../../src/client/geary-controller.vala:271
-msgid "_Mark as..."
-msgstr "نشان گذاری به عنوان..."
+#~ msgid "Real name:"
+#~ msgstr "نام حقیقی:"
 
-#: ../../ui/composer.glade:157
-msgid "_Medium"
-msgstr "متوسط"
+#~ msgid "Remove account"
+#~ msgstr "حذف حساب"
 
-#: ../../src/client/geary-controller.vala:309
-msgid "_Move"
-msgstr "انتقال"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "حذف فرمت بندی (Ctrl+Space)"
 
-#: ../../src/client/ui/stock.vala:18
-msgid "_OK"
-msgstr "تأیید"
+#~ msgid "SMTP Credentials"
+#~ msgstr "اعتبار نامه‌ی SMTP"
 
-#: ../../src/client/ui/stock.vala:26
-msgid "_Open"
-msgstr "باز کردن"
+#~ msgid "SMTP password"
+#~ msgstr "کلمه‌ی عبور SMTP"
 
-#: ../../ui/login.glade:131 ../../ui/login.glade:539
-#: ../../ui/password-dialog.glade:85
-msgid "_Password:"
-msgstr "کلمه عبور:"
+#~ msgid "SMTP settings"
+#~ msgstr "تنظیمات SMTP"
 
-#: ../../ui/composer.glade:35
-msgid "_Paste"
-msgstr "چسباندن"
+#~ msgid "SMTP username"
+#~ msgstr "نام کاربری SMTP"
 
-#: ../../ui/preferences.glade:172
-msgid "_Play notification sounds"
-msgstr "پخش کردن صداهای هشدار دهنده"
+#~ msgid "SSL"
+#~ msgstr "SSL"
 
-#: ../../src/client/geary-controller.vala:250
-#: ../../src/client/ui/stock.vala:27
-msgid "_Preferences"
-msgstr "تنظیمات"
+#~ msgid "SSL/TLS encryption:"
+#~ msgstr "رمزنگاری SSL/TLS:"
 
-#: ../../src/client/ui/stock.vala:28
-msgid "_Print..."
-msgstr "چاپ..."
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../../src/client/geary-controller.vala:266
-#: ../../src/client/ui/stock.vala:29
-msgid "_Quit"
-msgstr "خروج"
+#~ msgid "S_ans Serif"
+#~ msgstr "فونت Sans Serif"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "_Rebuild"
-msgstr "بازسازی"
+#~ msgid "S_erif"
+#~ msgstr "فونت Serif"
 
-#: ../../ui/composer.glade:14
-msgid "_Redo"
-msgstr "تکرار"
+#~ msgid "S_ervice:"
+#~ msgstr "خدمت:"
 
-#: ../../ui/password-dialog.glade:561
-msgid "_Remember passwords"
-msgstr "یادآوری کلمه‌های عبور"
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../../src/client/ui/stock.vala:30
-msgid "_Remove"
-msgstr "حذف"
+#~ msgid "Se_rver:"
+#~ msgstr "خدمات دهنده:"
 
-#: ../../src/client/geary-controller.vala:1496
-msgid "_Replace"
-msgstr "جایگذاری"
+#~ msgid "Send and receive email"
+#~ msgstr "ارسال و دریافت ایمیل‌ها"
 
-#: ../../src/client/geary-controller.vala:317
-#: ../../src/client/views/conversation-viewer.vala:1447
-msgid "_Reply"
-msgstr "پاسخ دادن"
+#~ msgid "Ser_ver:"
+#~ msgstr "خدمات دهنده:"
 
-#: ../../ui/composer.glade:141
-msgid "_Rich Text"
-msgstr "متن قابل فرم دهی"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../../ui/composer.glade:47
-msgid "_Right"
-msgstr "راست چین"
+#~ msgid "Server:"
+#~ msgstr "خدمات دهنده:"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:31
-msgid "_Save"
-msgstr "ذخیره"
+#~ msgid "Service:"
+#~ msgstr "خدمت:"
 
-#: ../../src/client/views/conversation-viewer.vala:1395
-msgid "_Save As..."
-msgstr "ذخیره به عنوان..."
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "نمایش هشدار برای ایمیل جدید"
 
-#: ../../src/client/views/conversation-viewer.vala:1414
-msgid "_Save Image As..."
-msgstr "ذخیره‌ی عکس با عنوان..."
+#~ msgid "Small"
+#~ msgstr "کوچک"
 
-#: ../../ui/composer.glade:594
-msgid "_Send"
-msgstr "ارسال"
+#~ msgid "Storage"
+#~ msgstr "فضای ذخیره سازی"
 
-#: ../../ui/composer.glade:163
-msgid "_Small"
-msgstr "کوچک"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "رو خط (Ctrl+K)"
 
-#: ../../src/client/geary-controller.vala:289
-msgid "_Star"
-msgstr "ستاره دار کردن"
+#~ msgid "To add them as attachments"
+#~ msgstr "جهت افزودن آن‌ها به عنوان پیوست"
 
-#: ../../ui/composer.glade:7
-msgid "_Undo"
-msgstr "برگشت"
+#~ msgid "Unable to login to email server"
+#~ msgstr "امکان ورود به سرویس دهنده‌ی ایمیل وجود ندارد"
 
-#: ../../ui/login.glade:522
-msgid "_Username:"
-msgstr "نام کاربری:"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "زیر خط (Ctrl+U)"
 
-#: ../../src/client/views/conversation-viewer.vala:1494
-msgid "_View Source"
-msgstr "دیدن کد متن"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "برداشتن نقل قول متن (Ctrl+[)"
 
-#. / 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 "User_name:"
+#~ msgstr "نام کاربری:"
 
-#: ../../src/client/views/conversation-viewer.vala:1148
-msgid "but actually goes to"
-msgstr "می‌باشد، اما در اصل می‌رود به"
+#~ msgid "Username:"
+#~ msgstr "نام کاربری:"
 
-#: ../../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "بایت"
+#~ msgid "Work, Home, etc."
+#~ msgstr "کار، منزل و غیره"
 
-#. / Placeholder filename for attachments with no filename.
-#: ../../src/client/views/conversation-viewer.vala:1799
-#: ../../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "هیچکدام"
+#~ msgid "_Attach File"
+#~ msgstr "پیوست فایل"
 
-#: ../../src/client/views/conversation-find-bar.vala:226
-msgid "not found"
-msgstr "پیدا نشد"
+#~ msgid "_Automatically select next message"
+#~ msgstr "انتخاب پیام بعدی به طور خودکار"
 
-#. / 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 "Hessam Shahpouri <h shahpouri yandex com>"
+#~ msgid "_Center"
+#~ msgstr "وسط چین"
+
+#~ msgid "_Delete"
+#~ msgstr "حذف"
+
+#~ msgid "_Details"
+#~ msgstr "جزئیات"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "نشان دادن پیش نمایش گفتگو"
+
+#~ msgid "_Donate"
+#~ msgstr "هدیه دادن"
+
+#~ msgid "_Download mail:"
+#~ msgstr "دانلود ایمیل:"
+
+#~ msgid "_Fixed Width"
+#~ msgstr "فونت Fixed Width"
+
+#~ msgid "_Include Original Attachments"
+#~ msgstr "همراه کردن پیوست‌های اصلی"
+
+#~ msgid "_Justify"
+#~ msgstr "کشیده"
+
+#~ msgid "_Left"
+#~ msgstr "چپ چین"
+
+#~ msgid "_Medium"
+#~ msgstr "متوسط"
+
+#~ msgid "_Password:"
+#~ msgstr "کلمه عبور:"
+
+#~ msgid "_Paste"
+#~ msgstr "چسباندن"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "پخش کردن صداهای هشدار دهنده"
+
+#~ msgid "_Redo"
+#~ msgstr "تکرار"
+
+#~ msgid "_Remember passwords"
+#~ msgstr "یادآوری کلمه‌های عبور"
+
+#~ msgid "_Rich Text"
+#~ msgstr "متن قابل فرم دهی"
+
+#~ msgid "_Right"
+#~ msgstr "راست چین"
+
+#~ msgid "_Send"
+#~ msgstr "ارسال"
+
+#~ msgid "_Small"
+#~ msgstr "کوچک"
+
+#~ msgid "_Undo"
+#~ msgstr "برگشت"
+
+#~ msgid "_Username:"
+#~ msgstr "نام کاربری:"
+
+#~ msgid "attach|enclosed|enclosing|cover letter"
+#~ msgstr "attach|enclosed|enclosing|cover letter"
diff --git a/po/fi.po b/po/fi.po
index 9846f12..8024f20 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,455 +9,430 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-09-05 05:13+0000\n"
-"PO-Revision-Date: 2015-09-05 16:47+0300\n"
-"Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:02+0000\n"
+"Last-Translator: Jiri Grönroos <Unknown>\n"
 "Language-Team: suomi <gnome-fi-laatu lists sourceforge net>\n"
-"Language: fi\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 2.91.6\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Sähköpostisovellus"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary-sähköposti"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Lähetä ja vastaanota sähköpostia"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Mail;Sähköposti;Maili;posti;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Lähetä viesti"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Lähetä sähköpostitse"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Lähetä tiedostoja Gearylla"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Tallenna"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:54+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: fi\n"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Lisää"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Luonnokset | Luonnos | Drafts | Draft"
 
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "Lisäosoitteet tilille %s"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr "Lähetetyt | Sent | Sent Mail | Sent Email | Sent E-Mail"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Tilit"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
+"Roskaposti | Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail "
+"| Bulk Email | Bulk E-Mail"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Etunimi Sukunimi"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Roskakori | Trash | Rubbish | Rubbish Bin"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Welcome to Geary."
-msgstr "Tervetuloa, käytössäsi on Geary."
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr "Arkisto | Arkistot | Archive | Archives"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Enter your account information to get started."
-msgstr "Anna tilisi tiedot, jotta voit aloittaa käytön."
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Saapuneet"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "2 weeks back"
-msgstr "2 viikkoa sitten"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Luonnokset"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "1 month back"
-msgstr "1 kuukausi sitten"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Lähetetyt"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "3 months back"
-msgstr "3 kuukautta sitten"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Tähdelliset"
 
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "6 months back"
-msgstr "6 kuukautta sitten"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Tärkeä"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "1 year back"
-msgstr "1 vuosi sitten"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Kaikki"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-msgid "2 years back"
-msgstr "2 vuotta sitten"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Roskaposti"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-msgid "4 years back"
-msgstr "4 vuotta sitten"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Roskakori"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "Everything"
-msgstr "Kaikki"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Lähetetyt"
 
-#: ../src/client/accounts/add-edit-page.vala:280
-msgid "Edit"
-msgstr "Muokkaa"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Etsi"
 
-#: ../src/client/accounts/add-edit-page.vala:282
-msgid "Preview"
-msgstr "Esikatsele"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Arkisto"
 
-#: ../src/client/accounts/add-edit-page.vala:723
-msgid "Remem_ber passwords"
-msgstr "M_uista salasanat"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Ei mitään"
 
-#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "_Muista salasana"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:764
-msgid "Unable to validate:\n"
-msgstr "Tarkistaminen epäonnistui:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:766
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Virheellinen tilin nimi.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:769
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; Sähköpostiosoite on jo lisätty Gearyyn.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:773
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP-yhteysvirhe.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:776
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; IMAP-käyttäjätunnus tai -salasana on väärin.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Muu"
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP-yhteysvirhe.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "liite"
 
-#: ../src/client/accounts/add-edit-page.vala:782
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; SMTP-käyttäjätunnus tai -salasana on väärin.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "piilokopio"
 
-#: ../src/client/accounts/add-edit-page.vala:786
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Yhteysvirhe.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "sisältö"
 
-#: ../src/client/accounts/add-edit-page.vala:790
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Käyttäjätunnus tai salasana on väärin.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "kopio"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Tekijänoikeus 2011-2015 Yorba Foundation"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "lähettäjä"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Vieraile Yorban verkkosivustolla"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "aihe"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Käynnistä Geary pääikkuna piilotettuna"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "vastaanottaja"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr ""
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "minä"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Lokita keskustelujen tarkkailu"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(ei aihetta)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr ""
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %e. %b %Y klo %H.%M"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Lokita verkkotoiminta"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "%1$s %2$s kirjoitti:"
 
-#. / 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 ""
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s kirjoitti:"
 
-#. / 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 ""
+#. / 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:234
+msgid "On %s:"
+msgstr "%s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr ""
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Edelleenlähetetty viesti ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Lokita tietokantaan kohdistuvat kyselyt (luo paljon viestejä)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Lähettäjä: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Lokita kansioiden normalisointi"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Aihe: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr ""
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Päiväys: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Kumoa kaikki palvelinvarmenteet, joissa on TLS-varoituksia"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Vastaanottaja: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Näytä sovelluksen versio"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Kopio: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Käytä %s uuden lähetysikkunan avaamista varten"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "ei mitään"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Kommentoi, ehdota uusia ideoita ja ilmoita vioista:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Sähköpostisovellus"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Komentorivivalintojen jäsennys epäonnistui: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "Tekijänoikeus 2011-2015 Yorba Foundation"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Tunnistamaton komentorivivalinta \"%s\"\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Vieraile Yorban verkkosivustolla"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:61
 #| msgid "Move conversation"
 msgid "Delete conversation"
 msgstr "Poista keskustelu"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Poista keskustelu (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Poista keskustelut (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:67
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Siirrä keskustelu roskakoriin (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:68
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "Siirrä keskustelut roskakoriin (Delete, Backspace)"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Arkistoi"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Arkistoi keskustelu (A)"
 
-#: ../src/client/application/geary-controller.vala:75
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Arkistoi keskustelut (A)"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Me_rkitse roskapostiksi"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Poista _roskapostimerkintä"
 
-#: ../src/client/application/geary-controller.vala:81
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Merkitse keskustelu"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Merkitse keskustelut"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Lisää tunniste keskusteluun"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Lisää tunniste keskusteluihin"
 
-#: ../src/client/application/geary-controller.vala:85
-#: ../src/client/application/geary-controller.vala:436
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Siirrä keskustelu"
 
-#: ../src/client/application/geary-controller.vala:86
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Siirrä keskustelut"
 
-#: ../src/client/application/geary-controller.vala:373
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "_Tilit"
 
-#: ../src/client/application/geary-controller.vala:378
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Asetukset"
 
-#: ../src/client/application/geary-controller.vala:382
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Ohje"
 
-#: ../src/client/application/geary-controller.vala:386
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../src/client/application/geary-controller.vala:390
-msgid "_Donate"
-msgstr "La_hjoita"
-
-#: ../src/client/application/geary-controller.vala:394
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../src/client/application/geary-controller.vala:399
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Merkitse..."
 
-#: ../src/client/application/geary-controller.vala:405
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Merkitse l_ukemattomaksi"
 
-#: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Merkitse tähdellä"
 
-#: ../src/client/application/geary-controller.vala:422
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "_Poista tähti"
 
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Lisää tunniste"
 
-#: ../src/client/application/geary-controller.vala:433
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Tunniste"
 
-#: ../src/client/application/geary-controller.vala:437
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: ../src/client/application/geary-controller.vala:441
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Kirjoita uusi viesti (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:445
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Vastaa (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:450
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "_Vastaa kaikille"
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Vastaa kaikille (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Lähetä edelleen"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Lähetä edelleen (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:496
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr "Tyhjennä"
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr "Tyhjennä roskaposti- tai roskakorikansiot"
 
-#: ../src/client/application/geary-controller.vala:501
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr "Tyhjennä ro_skapostikansio…"
 
-#: ../src/client/application/geary-controller.vala:505
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr "Tyhjennä _roskakorikansio…"
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:538
+#: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
 msgstr "Hakupalkki päälle/pois"
 
-#: ../src/client/application/geary-controller.vala:752
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Palvelimen luottamuspoikkeuksen varastointi epäonnistui"
 
-#: ../src/client/application/geary-controller.vala:989
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Asetuksesi eivät ole turvalliset"
 
-#: ../src/client/application/geary-controller.vala:990
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -467,17 +442,17 @@ msgstr ""
 "SSL:ää tai TLS:ää. Tämä tarkoittaa, että käyttäjätunnuksesi ja salasanasi on "
 "mahdollista lukea verkkoliikenteestä. Haluatko varmasti sallia tämän?"
 
-#: ../src/client/application/geary-controller.vala:991
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "_Jatka"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Virhe sähköpostia lähettäessä"
 
-#: ../src/client/application/geary-controller.vala:1070
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -485,36 +460,28 @@ msgstr ""
 "Geary kohtasi virheen viestiä lähettäessä. Jos ongelma toistuu, poista käsin "
 "kyseinen viesti Lähtevät-kansiosta."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Virhe lähetettyä postia tallennettaessa"
 
-#: ../src/client/application/geary-controller.vala:1075
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
 msgstr ""
-"Geary kohtasi virheen lähetettyä viestiä tallennettaessa Lähetetyt-"
-"kansioon.  Tämä viesti säilyy Lähtevät-kansiossa niin kauan, kunnes poistat "
-"sen."
+"Geary kohtasi virheen lähetettyä viestiä tallennettaessa Lähetetyt-kansioon. "
+" Tämä viesti säilyy Lähtevät-kansiossa niin kauan, kunnes poistat sen."
 
-#: ../src/client/application/geary-controller.vala:1144
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Tunnisteet"
 
-#. 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:1156
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Kohteen %s tietokannan avaaminen epäonnistui"
 
-#: ../src/client/application/geary-controller.vala:1157
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -539,21 +506,19 @@ msgstr ""
 "niiden liitteet. <b>Toimenpiteellä ei ole vaikutusta palvelimella oleviin "
 "viesteihin ja liitteisiin.</b>"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "Ra_kenna uudelleen"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "_Poistu"
 
-#: ../src/client/application/geary-controller.vala:1168
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Tietokannan jälleenrakennus tilille \"%s\" epäonnistui"
 
-#: ../src/client/application/geary-controller.vala:1169
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -563,17 +528,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1191
-#: ../src/client/application/geary-controller.vala:1201
-#: ../src/client/application/geary-controller.vala:1212
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Paikallisen postilaatikon avaaminen tilillä %s epäonnistui"
 
-#: ../src/client/application/geary-controller.vala:1192
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -591,7 +552,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1202
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -605,7 +566,7 @@ msgstr ""
 "\n"
 "Asenna uusin version Gearysta ja yritä uudelleen."
 
-#: ../src/client/application/geary-controller.vala:1213
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -617,27 +578,29 @@ msgstr ""
 "\n"
 "Tarkista yhteyden tila ja käynnistä Geary uudelleen."
 
-#: ../src/client/application/geary-controller.vala:1721
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "Tietoja %ssta"
 
 #. / 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-controller.vala:1724
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
-msgstr "Jiri Grönroos"
+msgstr ""
+"Jiri Grönroos\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Jiri Grönroos https://launchpad.net/~jiri-gronroos+l10n";
 
-#: ../src/client/application/geary-controller.vala:1990
+#: ../src/client/application/geary-controller.vala:1976
 msgid "Undo move (Ctrl+Z)"
 msgstr "Kumoa siirtäminen (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2000
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Haluatko varmasti avata kohteen \"%s\"?"
 
-#: ../src/client/application/geary-controller.vala:2001
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -645,300 +608,529 @@ msgstr ""
 "Liitetiedostot saattavat sisältää haitallista sisältöä.  Avaa liitteet "
 "ainoastaan, jos luotat niiden lähettäjään."
 
-#: ../src/client/application/geary-controller.vala:2002
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "_Älä kysy uudelleen"
 
-#: ../src/client/application/geary-controller.vala:2020
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Tiedosto nimellä \"%s\" on jo olemassa.  Haluatko korvata sen?"
 
-#: ../src/client/application/geary-controller.vala:2022
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "Tiedosto on jo olemassa kohteessa \"%s\".  Tiedoston korvaaminen korvaa "
 "nykyisen tiedoston sisällön."
 
-#: ../src/client/application/geary-controller.vala:2025
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Korvaa"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2323
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Suljetaanko luonnosviesti?"
 
-#: ../src/client/application/geary-controller.vala:2453
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr "Poistetaanko kaikki viesit \"%s\"-kansiosta?"
 
-#: ../src/client/application/geary-controller.vala:2454
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr "Tämä poistaa viestit Gearysta ja sähköpostipalvelimelta."
 
-#: ../src/client/application/geary-controller.vala:2455
+#: ../src/client/application/geary-controller.vala:2441
 msgid "This cannot be undone."
 msgstr "Toimintoa ei voi perua."
 
-#: ../src/client/application/geary-controller.vala:2456
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr "Tyhjennä %s"
 
-#: ../src/client/application/geary-controller.vala:2473
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 msgid "Error emptying %s"
 msgstr "Virhe tyhjennettäessä kohdetta %s"
 
-#: ../src/client/application/geary-controller.vala:2503
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Haluatko poistaa tämän viestin pysyvästi?"
 msgstr[1] "Haluatko poistaa nämä viestit pysyvästi?"
 
-#: ../src/client/application/geary-controller.vala:2505
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/client/application/geary-controller.vala:2536
+#: ../src/client/application/geary-controller.vala:2522
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Kumoa arkistointi (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2551
+#: ../src/client/application/geary-controller.vala:2537
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Kumoa roskakoriin siirto (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2604
+#: ../src/client/application/geary-controller.vala:2590
 msgid "Undo (Ctrl+Z)"
 msgstr "Kumoa (Ctrl+Z)"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i tulos"
-msgstr[1] "%i tulosta"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Käynnistä Geary pääikkuna piilotettuna"
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i tulos (yhteensä)"
-msgstr[1] "%i tulosta (yhteensä)"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr ""
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "ei löytynyt"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Lokita keskustelujen tarkkailu"
 
-#: ../src/client/components/main-window.vala:430
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr ""
 
-#: ../src/client/components/search-bar.vala:10
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Etsi"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Lokita verkkotoiminta"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:25
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Etsi hakusanoilla kaikista tilin sähköpostiviesteistä (Ctrl+S)"
+#. / 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 ""
 
-#: ../src/client/components/search-bar.vala:118
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indeksoidaan tiliä %s"
+#. / 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 ""
 
-#: ../src/client/components/search-bar.vala:129
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Etsi tililtä %s"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr ""
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Lähetetään..."
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Lokita tietokantaan kohdistuvat kyselyt (luo paljon viestejä)"
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_OK"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Lokita kansioiden normalisointi"
 
-#: ../src/client/components/stock.vala:19
-#: ../ui/edit_alternate_emails.glade.h:3 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Peru"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr ""
 
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Sulje"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Kumoa kaikki palvelinvarmenteet, joissa on TLS-varoituksia"
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Hylkää"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Näytä sovelluksen versio"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Avaa"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Käytä %s uuden lähetysikkunan avaamista varten"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Tulosta..."
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Kommentoi, ehdota uusia ideoita ja ilmoita vioista:"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Poista"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Komentorivivalintojen jäsennys epäonnistui: %s\n"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "Valitse _kaikki"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Tunnistamaton komentorivivalinta \"%s\"\n"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "Säil_ytä"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Uusia viestejä"
 
-#: ../src/client/composer/composer-widget.vala:73
-msgid "Saved"
-msgstr "Tallennettu"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d uusi viesti"
+msgstr[1] "%d uutta viestiä"
 
-#: ../src/client/composer/composer-widget.vala:74
-msgid "Saving"
-msgstr "Tallennetaan"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d uusi viesti yhteensä"
+msgstr[1] "%s, %d uutta viestiä yhteensä"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "Error saving"
-msgstr "Virhe tallentaessa"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d muu uusi viesti tilille %s)"
+msgstr[1] ""
+"%s\n"
+"(%d muuta uutta viestiä tilille %s)"
 
-#: ../src/client/composer/composer-widget.vala:76
-msgid "Press Backspace to delete quote"
-msgstr "Paina askelpalautinta poistaaksesi lainauksen"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Avaa"
 
-#: ../src/client/composer/composer-widget.vala:77
-msgid "New Message"
-msgstr "Uusi viesti"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Minä"
 
-#. A 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:138
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr "Turvaton yhteys: %s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
+"Postipalvelimen %s identiteettiä osoitteessa %s:%u ei voitu vahvistaa."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
 msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures|liite|liitetiedosto|liitteen|"
-"liitetiedostot|liitän"
+"Valitsemalla \"Luota tähän palvelimeen\" tai \"Luota aina tähän "
+"palvelimeen\" saattaa aiheuttaa käyttäjätunnuksen ja salasanan välittämisen "
+"turvattomasti."
 
-#: ../src/client/composer/composer-widget.vala:1102
-#: ../src/client/composer/composer-widget.vala:1106
-msgid "Do you want to discard this message?"
-msgstr "Haluatko hylätä tämän viestin?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"Valitsemalla \"Älä luota tähän palvelimeen\" Geary ei ota yhteyttä kyseiseen "
+"palvelimeen."
 
-#: ../src/client/composer/composer-widget.vala:1262
-msgid "Send message with an empty subject and body?"
-msgstr "Lähetetäänkö viesti ilman aihetta ja sisältöä?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Geary ei lisää tai päivitä tätä sähköpostitiliä."
 
-#: ../src/client/composer/composer-widget.vala:1264
-msgid "Send message with an empty subject?"
-msgstr "Lähetetäänkö viesti ilman aihetta?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"Valitsemalla \"Älä luota tähän palvelimeen\" Geary ei enää käytä kyseessä "
+"olevaa tiliä."
 
-#: ../src/client/composer/composer-widget.vala:1266
-msgid "Send message with an empty body?"
-msgstr "Lähetetäänkö viesti ilman sisältöä?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr "Geary sulkeutuu, jos avoinna ei ole muita sähköpostitilejä."
 
-#: ../src/client/composer/composer-widget.vala:1268
-msgid "Send message without an attachment?"
-msgstr "Lähetetäänkö viesti ilman liitettä?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Ota yhteys järjestelmän ylläpitäjään tai sähköpostipalveluun, jos sinulla on "
+"kysymyksiä näihin asioihin liittyen."
 
-#: ../src/client/composer/composer-widget.vala:1530
-msgid "Cannot add attachment"
-msgstr "Liitteen lisäys epäonnistui"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
+"Palvelimen varmennetta ei ole allekirjoitettu tunnetun tahon toimesta"
 
-#: ../src/client/composer/composer-widget.vala:1541
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "Kohdetta \"%s\" ei löytynyt."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr "Palvelimen identiteetti ei vastaa varmenteen identiteettiä"
 
-#: ../src/client/composer/composer-widget.vala:1548
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" on kansio."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Palvelimen varmenne on vanhentunut"
 
-#: ../src/client/composer/composer-widget.vala:1555
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" on tyhjä tiedosto."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "Palvelimen varmennetta ei ole aktivoitu"
 
-#: ../src/client/composer/composer-widget.vala:1569
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "Kohteen \"%s\" avaus lukua varten epäonnistui."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "Palvelimen varmenne on kumottu, joten se on nyt virheellinen"
 
-#: ../src/client/composer/composer-widget.vala:1576
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" on jo liitetty lähetystä varten."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "Palvelimen varmennetta kohdellaan turvattomana"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1585
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr "Virhe palvelimen varmennetta käsiteltäessä"
 
-#: ../src/client/composer/composer-widget.vala:1645
-msgid "To: "
-msgstr "Vastaanottaja:"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr "Geary vaatii sähköpostisalasanasi jatkamista varten"
 
-#: ../src/client/composer/composer-widget.vala:1648
-msgid "Cc: "
-msgstr "Kopio:"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Valitse tiedosto"
 
-#: ../src/client/composer/composer-widget.vala:1651
-msgid "Bcc: "
-msgstr "Piilokopio:"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Liitä"
 
-#: ../src/client/composer/composer-widget.vala:1654
-msgid "Reply-To: "
-msgstr "Vastausosoite:"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr "Lisäosoitteet tilille %s"
 
-#: ../src/client/composer/composer-widget.vala:1887
-msgid "Select Color"
-msgstr "Valitse väri"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Tilit"
 
-#. 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:2322
-#, c-format
-msgid "%1$s via %2$s"
-msgstr "%1$s välityksellä %2$s"
+#. / 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 "Etunimi Sukunimi"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2364
-msgid "_From:"
-msgstr "_Lähettäjä:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Tervetuloa, käytössäsi on Geary."
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Minä"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Anna tilisi tiedot, jotta voit aloittaa käytön."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 viikkoa sitten"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 kuukausi sitten"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 kuukautta sitten"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 kuukautta sitten"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 vuosi sitten"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "2 vuotta sitten"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "4 vuotta sitten"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Kaikki"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "Muokkaa"
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr "Esikatsele"
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "M_uista salasanat"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "_Muista salasana"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Tarkistaminen epäonnistui:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Virheellinen tilin nimi.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Sähköpostiosoite on jo lisätty Gearyyn.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; IMAP-yhteysvirhe.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; IMAP-käyttäjätunnus tai -salasana on väärin.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; SMTP-yhteysvirhe.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; SMTP-käyttäjätunnus tai -salasana on väärin.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Yhteysvirhe.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Käyttäjätunnus tai salasana on väärin.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Tallenna"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Lisää"
+
+#. / 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 "%l:%M %P"
+
+#. / 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. %Bta %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. %Bta %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. %Bta %Y, %-l:%M %P"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Nyt"
+
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "%d min sitten"
+msgstr[1] "%d min sitten"
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "%d t sitten"
+msgstr[1] "%d t sitten"
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Eilen"
+
+#. / 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
+msgid "%A"
+msgstr "%A"
+
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "tavua"
+
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "Tt"
+
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "Gt"
+
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "Mt"
+
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "kt"
+
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d viesti"
+msgstr[1] "%d viestiä"
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d lukematon"
+msgstr[1] "%d lukematonta"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Saapuneet"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Etsi tililtä %s"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d tulos"
+msgstr[1] "%d tulosta"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "Keskusteluja ei ole valittu."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "%u keskustelu valittu."
@@ -993,42 +1185,38 @@ msgid "Date:"
 msgstr "Päiväys:"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "%u luettu viesti"
 msgstr[1] "%u luettua viestiä"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr ""
 "Tämä viesti lähetettiin onnistuneesti, mutta sen tallennus kohteeseen %s "
 "epäonnistui."
 
-#. Add a menu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#. Add a menu item for copying the address.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "Kopioi _sähköpostiosoite"
 
-#. Add a menu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Kopioi _linkki"
 
-#. Select message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "_Valitse viesti"
 
-#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Valitse _kaikki"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "T_utki"
@@ -1041,7 +1229,6 @@ msgstr "Tämä linkki vaikuttaa johtavan kohteeseen"
 msgid "but actually goes to"
 msgstr "mutta viekin kohteeseen"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
 msgstr " (Virheellinen?)"
@@ -1064,12 +1251,10 @@ msgid_plural "Save All A_ttachments..."
 msgstr[0] "_Tallenna liite"
 msgstr[1] "_Tallenna liitteet"
 
-#. Reply to all on a message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "_Vastaa kaikille"
 
-#. Mark as read/unread.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "_Merkitse luetuksi"
@@ -1082,1068 +1267,622 @@ msgstr "_Merkitse lukemattomaksi"
 msgid "Mark Unread From _Here"
 msgstr "Merkitse lukemattomaksi tästä e_delleen"
 
-#. Separator.
-#. View original message source.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "Näytä lä_hde"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:378
-msgid "none"
-msgstr "ei mitään"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "Oletustekstimuokkaimen avaus epäonnistui."
 
 #: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s - Keskustelun tutkija"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Valitse tiedosto"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Tallennettu"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Liitä"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Tallennetaan"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
-msgid "Untrusted Connection: %s"
-msgstr "Turvaton yhteys: %s"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Virhe tallentaessa"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
-msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr "Postipalvelimen %s identiteettiä osoitteessa %s:%u ei voitu vahvistaa."
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "Paina askelpalautinta poistaaksesi lainauksen"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
-msgid ""
-"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-"your username and password to be transmitted insecurely."
-msgstr ""
-"Valitsemalla \"Luota tähän palvelimeen\" tai \"Luota aina tähän palvelimeen"
-"\" saattaa aiheuttaa käyttäjätunnuksen ja salasanan välittämisen "
-"turvattomasti."
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Uusi viesti"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-"server."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Valitsemalla \"Älä luota tähän palvelimeen\" Geary ei ota yhteyttä kyseiseen "
-"palvelimeen."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures|liite|liitetiedosto|liitteen|liitetiedo"
+"stot|liitän"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
-msgid "Geary will not add or update this email account."
-msgstr "Geary ei lisää tai päivitä tätä sähköpostitiliä."
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Haluatko hylätä tämän viestin?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-"this account."
-msgstr ""
-"Valitsemalla \"Älä luota tähän palvelimeen\" Geary ei enää käytä kyseessä "
-"olevaa tiliä."
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Lähetetäänkö viesti ilman aihetta ja sisältöä?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr "Geary sulkeutuu, jos avoinna ei ole muita sähköpostitilejä."
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Lähetetäänkö viesti ilman aihetta?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
-msgid ""
-"Contact your system administrator or email service provider if you have any "
-"question about these issues."
-msgstr ""
-"Ota yhteys järjestelmän ylläpitäjään tai sähköpostipalveluun, jos sinulla on "
-"kysymyksiä näihin asioihin liittyen."
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Lähetetäänkö viesti ilman sisältöä?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
-msgstr "Palvelimen varmennetta ei ole allekirjoitettu tunnetun tahon toimesta"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Lähetetäänkö viesti ilman liitettä?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
-msgid "The server's identity does not match the identity in the certificate"
-msgstr "Palvelimen identiteetti ei vastaa varmenteen identiteettiä"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Liitteen lisäys epäonnistui"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
-msgid "The server's certificate has expired"
-msgstr "Palvelimen varmenne on vanhentunut"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "Kohdetta \"%s\" ei löytynyt."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
-msgid "The server's certificate has not been activated"
-msgstr "Palvelimen varmennetta ei ole aktivoitu"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" on kansio."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
-msgid "The server's certificate has been revoked and is now invalid"
-msgstr "Palvelimen varmenne on kumottu, joten se on nyt virheellinen"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" on tyhjä tiedosto."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
-msgid "The server's certificate is considered insecure"
-msgstr "Palvelimen varmennetta kohdellaan turvattomana"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "Kohteen \"%s\" avaus lukua varten epäonnistui."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
-msgid "An error has occurred processing the server's certificate"
-msgstr "Virhe palvelimen varmennetta käsiteltäessä"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "\"%s\" on jo liitetty lähetystä varten."
 
-#. 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 "Geary requires your email password to continue"
-msgstr "Geary vaatii sähköpostisalasanasi jatkamista varten"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. 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 viesti"
-msgstr[1] "%d viestiä"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Vastaanottaja: "
 
-#. / 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 lukematon"
-msgstr[1] "%d lukematonta"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Kopio: "
 
-#. / 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/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Piilokopio: "
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Saapuneet"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "Vastausosoite: "
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d tulos"
-msgstr[1] "%d tulosta"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Valitse väri"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Uusia viestejä"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr "%1$s välityksellä %2$s"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d uusi viesti"
-msgstr[1] "%d uutta viestiä"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_Lähettäjä:"
 
-#: ../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 uusi viesti yhteensä"
-msgstr[1] "%s, %d uutta viestiä yhteensä"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 muu uusi viesti tilille %s)"
-msgstr[1] ""
-"%s\n"
-"(%d muuta uutta viestiä tilille %s)"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Lähetetään..."
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Avaa"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i tulos"
+msgstr[1] "%i tulosta"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i tulos (yhteensä)"
+msgstr[1] "%i tulosta (yhteensä)"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "ei löytynyt"
 
-#. / 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"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_OK"
 
-#. / 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"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Peru"
 
-#. / 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"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Sulje"
 
-#. / 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. %Bta %Y, %-l:%M %P"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Hylkää"
 
-#. / 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. %Bta %Y, %-H:%M"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Avaa"
 
-#. / 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. %Bta %Y, %-l:%M %P"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Tulosta..."
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Nyt"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Poista"
 
-#: ../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "%d min sitten"
-msgstr[1] "%d min sitten"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "Säil_ytä"
 
-#: ../src/client/util/util-date.vala:171
-#, c-format
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "%d t sitten"
-msgstr[1] "%d t sitten"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Etsi hakusanoilla kaikista tilin sähköpostiviesteistä (Ctrl+S)"
 
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "Eilen"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Indeksoidaan tiliä %s"
 
-#. / 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"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(ei aihetta)"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary-sähköposti"
 
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "tavua"
+#~ msgid "Send and receive email"
+#~ msgstr "Lähetä ja vastaanota sähköpostia"
 
-#: ../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "Tt"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Email;E-mail;Mail;Sähköposti;Maili;posti;"
 
-#: ../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "Gt"
+#~ msgid "Compose Message"
+#~ msgstr "Lähetä viesti"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "Mt"
+#~ msgid "Send by email"
+#~ msgstr "Lähetä sähköpostitse"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "kt"
+#~ msgid "Send files using Geary"
+#~ msgstr "Lähetä tiedostoja Gearylla"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#~ msgid "_Donate"
+#~ msgstr "La_hjoita"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Tilin poistaminen epäonnistui</span> "
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Viestin lähetysikkuna tälle tilille on jo avoinna. Lähetä tai hylkää viesti, "
+#~ "ja yritä sitten uudelleen."
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Muu"
+#~ msgid "Add account"
+#~ msgstr "Lisää tili"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#~ msgid "Edit account"
+#~ msgstr "Muokkaa tiliä"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#~ msgid "Remove account"
+#~ msgstr "Poista tili"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Saapuneet"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Odota hetki, Geary tarkistaa tiliäsi."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Luonnokset"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Ei-luotettu yhteys"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Lähetetyt"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "_Luota aina tähän palvelimeen"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Tähdelliset"
+#~ msgid "_Trust This Server"
+#~ msgstr "Luota _tähän palvelimeen"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Tärkeä"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "_Älä luota tähän palvelimeen"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Kaikki"
+#~ msgid "_Undo"
+#~ msgstr "_Kumoa"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Roskaposti"
+#~ msgid "_Redo"
+#~ msgstr "_Tee uudelleen"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Roskakori"
+#~ msgid "Cu_t"
+#~ msgstr "_Leikkaa"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Lähetetyt"
+#~ msgid "_Paste"
+#~ msgstr "L_iitä"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Arkisto"
+#~ msgid "_Left"
+#~ msgstr "_Vasemmalle"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-msgstr "Ei mitään"
+#~ msgid "_Right"
+#~ msgstr "_Oikealle"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-msgid "attachment"
-msgstr "liite"
+#~ msgid "_Center"
+#~ msgstr "_Keskelle"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
-msgstr "piilokopio"
+#~ msgid "_Justify"
+#~ msgstr "_Tasaa"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
-msgstr "sisältö"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Linkki (Ctrl+L)"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "cc"
-msgstr "kopio"
+#~ msgid "C_olor"
+#~ msgstr "Vä_ri"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
-msgstr "lähettäjä"
+#~ msgid "More options"
+#~ msgstr "Lisää valintoja"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-msgid "subject"
-msgstr "aihe"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Lainaa tekstiä (Ctrl+])"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
-msgstr "vastaanottaja"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Poista tekstin lainaus (Ctrl+[)"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
-msgstr "minä"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Poista muotoilu (Ctrl+Space)"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-msgid "Drafts | Draft"
-msgstr "Luonnokset | Luonnos | Drafts | Draft"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Lii_tä muotoilujen kera"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "Lähetetyt | Sent | Sent Mail | Sent Email | Sent E-Mail"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Lihavoitu (Ctrl+B)"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
-msgstr ""
-"Roskaposti | Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail "
-"| Bulk Email | Bulk E-Mail"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Kursivoitu (Ctrl+I)"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Roskakori | Trash | Rubbish | Rubbish Bin"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Alleviivattu (Ctrl+U)"
 
-#. List of folder names to match for Archive, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
-msgid "Archive | Archives"
-msgstr "Arkisto | Arkistot | Archive | Archives"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Yliviivattu (Ctrl+K)"
 
-#. / 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:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %e. %b %Y klo %H.%M"
+#~ msgid "_Rich Text"
+#~ msgstr "Muotoilu - _RTF"
 
-#. / 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:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "%1$s %2$s kirjoitti:"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Näytä laajennetut kentät"
 
-#. / 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:228
-#, c-format
-msgid "%s wrote:"
-msgstr "%s kirjoitti:"
+#~ msgctxt "Label"
+#~ msgid "Close and Save"
+#~ msgstr "Sulje ja tallenna"
 
-#. / 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:234
-#, c-format
-msgid "On %s:"
-msgstr "%s:"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "Sulje ja tallenna"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Edelleenlähetetty viesti ----------"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "Sulje ja tallenna"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "Lähettäjä: %s\n"
+#~ msgctxt "Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Sulje ja hylkää"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Aihe: %s\n"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Sulje ja hylkää"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "Päiväys: %s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "Sulje ja hylkää"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "Vastaanottaja: %s\n"
+#~ msgid "Lar_ge"
+#~ msgstr "_Suuri"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Kopio: %s\n"
+#~ msgid "Large"
+#~ msgstr "Suuri"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Tilin poistaminen epäonnistui</span> "
+#~ msgid "_Medium"
+#~ msgstr "Ta_vallinen"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Viestin lähetysikkuna tälle tilille on jo avoinna. Lähetä tai hylkää viesti, "
-"ja yritä sitten uudelleen."
+#~ msgid "Medium"
+#~ msgstr "Normaali"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Lisää tili"
+#~ msgid "_Small"
+#~ msgstr "_Pieni"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Muokkaa tiliä"
+#~ msgid "Small"
+#~ msgstr "Pieni"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Poista tili"
+#~ msgid "S_ans Serif"
+#~ msgstr "_Päätteetön"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Odota hetki, Geary tarkistaa tiliäsi."
+#~ msgid "Sans Serif"
+#~ msgstr "Päätteetön"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Ei-luotettu yhteys"
+#~ msgid "S_erif"
+#~ msgstr "P_äätteellinen"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "_Luota aina tähän palvelimeen"
+#~ msgid "Serif"
+#~ msgstr "Päätteellinen"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "Luota _tähän palvelimeen"
+#~ msgid "_Fixed Width"
+#~ msgstr "_Tasalevyinen"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "_Älä luota tähän palvelimeen"
+#~ msgid "Fixed Width"
+#~ msgstr "Tasalevyinen"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Kumoa"
-
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Tee uudelleen"
-
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "_Leikkaa"
-
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "L_iitä"
-
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Vasemmalle"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Oikealle"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Keskelle"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Tasaa"
-
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Linkki (Ctrl+L)"
-
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "Vä_ri"
-
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Lisää valintoja"
-
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Lainaa tekstiä (Ctrl+])"
-
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Poista tekstin lainaus (Ctrl+[)"
-
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Poista muotoilu (Ctrl+Space)"
-
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Lii_tä muotoilujen kera"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Lihavoitu (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Kursivoitu (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Alleviivattu (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Yliviivattu (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "Muotoilu - _RTF"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Näytä laajennetut kentät"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "Sulje ja tallenna"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "Sulje ja tallenna"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "Sulje ja tallenna"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "Sulje ja hylkää"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "Sulje ja hylkää"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "Sulje ja hylkää"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "_Suuri"
-
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "Suuri"
-
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "Ta_vallinen"
-
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "Normaali"
-
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "_Pieni"
-
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "Pieni"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "_Päätteetön"
-
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "Päätteetön"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "P_äätteellinen"
-
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "Päätteellinen"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "_Tasalevyinen"
-
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "Tasalevyinen"
-
-#: ../ui/composer.glade.h:42
-msgid "Detach"
-msgstr "Irrota"
-
-#: ../ui/composer.glade.h:43
-msgid "Detach (Ctrl+D)"
-msgstr "Irrota (Ctrl+D)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_Lähetä"
-
-#: ../ui/composer.glade.h:45
-msgid "Send"
-msgstr "Lähetä"
-
-#: ../ui/composer.glade.h:46
-msgid "Send (Ctrl+Enter)"
-msgstr "Lähetä (Ctrl+Enter)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "Liit_ä tiedosto"
-
-#: ../ui/composer.glade.h:48
-msgid "Attach File"
-msgstr "Liitä tiedosto"
-
-#: ../ui/composer.glade.h:49
-msgid "_Include Original Attachments"
-msgstr "_Sisällytä alkuperäiset liitteet"
-
-#: ../ui/composer.glade.h:50
-msgid "Include Original Attachments"
-msgstr "Sisällytä alkuperäiset liitteet"
-
-#: ../ui/composer.glade.h:51
-msgid "Application Menu"
-msgstr "Sovellusvalikko"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:53
-msgid "_To"
-msgstr "_Vastaanottaja"
+#~ msgid "Detach"
+#~ msgstr "Irrota"
 
-#: ../ui/composer.glade.h:54
-msgid "_Cc"
-msgstr "_Kopio"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Irrota (Ctrl+D)"
 
-#: ../ui/composer.glade.h:55
-msgid "_Subject"
-msgstr "_Aihe"
+#~ msgid "_Send"
+#~ msgstr "_Lähetä"
 
-#: ../ui/composer.glade.h:56
-msgid "_Bcc"
-msgstr "_Piilokopio"
+#~ msgid "Send"
+#~ msgstr "Lähetä"
 
-#: ../ui/composer.glade.h:57
-msgid "_Reply-To"
-msgstr "Vasta_usosoite"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Lähetä (Ctrl+Enter)"
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:59
-msgid "From"
-msgstr "Lähettäjä"
+#~ msgid "_Attach File"
+#~ msgstr "Liit_ä tiedosto"
 
-#: ../ui/composer.glade.h:60
-msgid "Drop files here"
-msgstr "Pudota tiedostot tähän"
+#~ msgid "Attach File"
+#~ msgstr "Liitä tiedosto"
 
-#: ../ui/composer.glade.h:61
-msgid "To add them as attachments"
-msgstr "lisätäksesi ne liitteiksi"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Sisällytä alkuperäiset liitteet"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-msgid "Remove email address"
-msgstr "Poista sähköpostiosoite"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Sisällytä alkuperäiset liitteet"
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"Jotkin sähköpostipalvelut vaativat lisäosoitteiden oltava määritelty "
-"palvelimelle. Lisätietoja saat sähköpostipalvelun sinulle tarjoavalta "
-"taholta."
+#~ msgid "Application Menu"
+#~ msgstr "Sovellusvalikko"
 
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "P_äivitä"
+#~ msgid "_To"
+#~ msgstr "_Vastaanottaja"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Etsi:"
+#~ msgid "_Cc"
+#~ msgstr "_Kopio"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Edellinen"
+#~ msgid "_Subject"
+#~ msgstr "_Aihe"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Seuraava"
+#~ msgid "_Bcc"
+#~ msgstr "_Piilokopio"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Huomioi kirjainkoko"
+#~ msgid "_Reply-To"
+#~ msgstr "Vasta_usosoite"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "nimike"
+#~ msgid "From"
+#~ msgstr "Lähettäjä"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Salasana"
+#~ msgid "Drop files here"
+#~ msgstr "Pudota tiedostot tähän"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "_Sähköpostiosoite"
+#~ msgid "To add them as attachments"
+#~ msgstr "lisätäksesi ne liitteiksi"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Salasana"
+#~ msgid "Remove email address"
+#~ msgstr "Poista sähköpostiosoite"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "_Palvelu"
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "Jotkin sähköpostipalvelut vaativat lisäosoitteiden oltava määritelty "
+#~ "palvelimelle. Lisätietoja saat sähköpostipalvelun sinulle tarjoavalta "
+#~ "taholta."
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "_Nimi"
+#~ msgid "_Update"
+#~ msgstr "P_äivitä"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "Ni_mimerkki"
+#~ msgid "Find:"
+#~ msgstr "Etsi:"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Koti, työ tms."
+#~ msgid "_Previous"
+#~ msgstr "_Edellinen"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_Tallenna lähetetyt viestit"
+#~ msgid "_Next"
+#~ msgstr "_Seuraava"
 
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
-msgstr "Lisäosoitteet…"
+#~ msgid "_Case sensitive"
+#~ msgstr "_Huomioi kirjainkoko"
 
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "IMAP-asetukset"
+#~ msgid "label"
+#~ msgstr "nimike"
 
-#: ../ui/login.glade.h:12
-msgid "Se_rver"
-msgstr "P_alvelin"
+#~ msgid "Password"
+#~ msgstr "Salasana"
 
-#: ../ui/login.glade.h:13
-msgid "P_ort"
-msgstr "P_ortti"
+#~ msgid "E_mail address"
+#~ msgstr "_Sähköpostiosoite"
 
-#: ../ui/login.glade.h:14
-msgid "Ser_ver"
-msgstr "Pal_velin"
+#~ msgid "_Password"
+#~ msgstr "_Salasana"
 
-#: ../ui/login.glade.h:15
-msgid "Por_t"
-msgstr "Portt_i"
+#~ msgid "S_ervice"
+#~ msgstr "_Palvelu"
 
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "SMTP-asetukset"
+#~ msgid "N_ame"
+#~ msgstr "_Nimi"
 
-#: ../ui/login.glade.h:17
-msgid "User_name"
-msgstr "_Käyttäjätunnus"
+#~ msgid "N_ickname"
+#~ msgstr "Ni_mimerkki"
 
-#: ../ui/login.glade.h:18
-msgid "Pass_word"
-msgstr "_Salasana"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Koti, työ tms."
 
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr "SMTP-käyttäjätunnus"
+#~ msgid "_Save sent mail"
+#~ msgstr "_Tallenna lähetetyt viestit"
 
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr "SMTP-salasana"
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "Lisäosoitteet…"
 
-#: ../ui/login.glade.h:21
-msgid "_Username"
-msgstr "K_äyttäjätunnus"
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP-asetukset"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr "IMAP-käyttäjätunnus"
+#~ msgid "Se_rver"
+#~ msgstr "P_alvelin"
 
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr "IMAP-salasana"
+#~ msgid "P_ort"
+#~ msgstr "P_ortti"
 
-#: ../ui/login.glade.h:24
-msgid "Encr_yption"
-msgstr "Sala_us"
+#~ msgid "Ser_ver"
+#~ msgstr "Pal_velin"
 
-#: ../ui/login.glade.h:25
-msgid "Encrypt_ion"
-msgstr "Salau_s"
+#~ msgid "Por_t"
+#~ msgstr "Portt_i"
 
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP-asetukset"
 
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "User_name"
+#~ msgstr "_Käyttäjätunnus"
 
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "Tunnistautumista ei _vaadita"
+#~ msgid "Pass_word"
+#~ msgstr "_Salasana"
 
-#: ../ui/login.glade.h:30
-msgid "Use IMAP cre_dentials"
-msgstr "Kä_ytä IMAP-tunnuksia"
+#~ msgid "SMTP username"
+#~ msgstr "SMTP-käyttäjätunnus"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Lähettäminen"
+#~ msgid "SMTP password"
+#~ msgstr "SMTP-salasana"
 
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr "Tall_enna luonnokset palvelimelle"
+#~ msgid "_Username"
+#~ msgstr "K_äyttäjätunnus"
 
-#: ../ui/login.glade.h:33
-msgid "Si_gn emails (HTML allowed):"
-msgstr "_Allekirjoita viestit (HTML sallittu):"
+#~ msgid "IMAP username"
+#~ msgstr "IMAP-käyttäjätunnus"
 
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "Varastointi"
+#~ msgid "IMAP password"
+#~ msgstr "IMAP-salasana"
 
-#: ../ui/login.glade.h:35
-msgid "_Download mail"
-msgstr "_Lataa sähköposti"
+#~ msgid "Encr_yption"
+#~ msgstr "Sala_us"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "SMTP-tunnukset"
+#~ msgid "Encrypt_ion"
+#~ msgstr "Salau_s"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "Käyttäjätunnus"
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Muista salasana"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Tunnistaudu"
+#~ msgid "No authentication re_quired"
+#~ msgstr "Tunnistautumista ei _vaadita"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Lukeminen"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Kä_ytä IMAP-tunnuksia"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "_Valitse automaattisesti seuraava viesti"
+#~ msgid "Composer"
+#~ msgstr "Lähettäminen"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "N_äytä keskustelun esikatselu"
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Tall_enna luonnokset palvelimelle"
 
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr "Kä_ytä kolmen paneelin näkymää"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "_Allekirjoita viestit (HTML sallittu):"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "_Käytä oikolukua"
+#~ msgid "Storage"
+#~ msgstr "Varastointi"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "Ilmoitukset"
+#~ msgid "_Download mail"
+#~ msgstr "_Lataa sähköposti"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "_Toista ilmoitusäänet"
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP-tunnukset"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "_Näytä ilmoitus uuden viestin saapuessa"
+#~ msgid "Username"
+#~ msgstr "Käyttäjätunnus"
 
-#: ../ui/preferences.glade.h:10
-msgid "Always _watch for new mail"
-msgstr "_Tarkkaile aina uusia viestejä"
+#~ msgid "_Remember password"
+#~ msgstr "_Muista salasana"
 
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr "Geary toimii taustalla ja ilmoittaa uusista viesteistä"
+#~ msgid "_Authenticate"
+#~ msgstr "_Tunnistaudu"
 
-#: ../ui/preferences.glade.h:12
-msgid "Preferences"
-msgstr "Asetukset"
+#~ msgid "Reading"
+#~ msgstr "Lukeminen"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Haluatko varmasti poistaa tämän tilin?"
-"</span> "
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Valitse automaattisesti seuraava viesti"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Kaikki tähän tiliin liittyvä posti poistetaan koneeltasi. Mitään postia ei "
-"poisteta palvelimelta."
+#~ msgid "_Display conversation preview"
+#~ msgstr "N_äytä keskustelun esikatselu"
+
+#~ msgid "Use _three pane view"
+#~ msgstr "Kä_ytä kolmen paneelin näkymää"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "_Käytä oikolukua"
+
+#~ msgid "Notifications"
+#~ msgstr "Ilmoitukset"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Toista ilmoitusäänet"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "_Näytä ilmoitus uuden viestin saapuessa"
+
+#~ msgid "Always _watch for new mail"
+#~ msgstr "_Tarkkaile aina uusia viestejä"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr "Geary toimii taustalla ja ilmoittaa uusista viesteistä"
+
+#~ msgid "Preferences"
+#~ msgstr "Asetukset"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Haluatko varmasti poistaa tämän "
+#~ "tilin?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Kaikki tähän tiliin liittyvä posti poistetaan koneeltasi. Mitään postia ei "
+#~ "poisteta palvelimelta."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Kutsumanimi:"
+#~ msgid "Nickname:"
+#~ msgstr "Kutsumanimi:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Sähköpostiosoite:"
+#~ msgid "Email address:"
+#~ msgstr "Sähköpostiosoite:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Gearyn päivitys on meneillään…"
+#~ msgid "Geary update in progress…"
+#~ msgstr "Gearyn päivitys on meneillään…"
 
 #~ msgid "_Delete"
 #~ msgstr "_Poista"
@@ -2153,8 +1892,7 @@ msgstr "Gearyn päivitys on meneillään…"
 
 #~ msgid "attach|enclosed|enclosing|cover letter"
 #~ msgstr ""
-#~ "attach|enclosed|enclosing|cover letter|liite|tiedosto|liitteenä|"
-#~ "liitetiedosto"
+#~ "attach|enclosed|enclosing|cover letter|liite|tiedosto|liitteenä|liitetiedosto"
 
 #~ msgid "Do you want to discard the unsaved message?"
 #~ msgstr "Haluatko hylätä tallentamattoman viestin?"
@@ -2171,7 +1909,6 @@ msgstr "Gearyn päivitys on meneillään…"
 #~ msgid "Notify of new mail at start_up"
 #~ msgstr "_Ilmoita uusista viesteistä käynnistyksen yhteydessä"
 
-#~| msgid "_Close"
 #~ msgid "C_lose"
 #~ msgstr "_Sulje"
 
diff --git a/po/fr.po b/po/fr.po
index ec09a9a..99ec040 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -20,457 +20,430 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-04-27 05:10+0000\n"
-"PO-Revision-Date: 2015-04-27 20:44+0200\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:03+0000\n"
 "Last-Translator: Cédric Bellegarde <cedric bellegarde adishatz org>\n"
 "Language-Team: français <gnomefr traduc org>\n"
-"Language: fr\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: Poedit 1.7.5\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Client de messagerie"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Messagerie Geary"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Envoyer et recevoir des courriels"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Messagerie;Courriels;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Écrire un message"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Envoyer par courriel"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Envoyer des fichiers avec Geary"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Enregistrer"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:54+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: fr\n"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Ajouter"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Brouillons | Brouillon | Drafts | Draft"
 
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "Adresses supplémentaires pour %s"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
+"Envoyés | Messages envoyés | Sent | Sent Mail | Sent Email | Sent E-Mail"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Comptes"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
+"Pourriel | Pourriels | Indésirables | Messages indésirables | Junk | Spam | "
+"Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email | Bulk E-Mail"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Prénom Nom"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Corbeille | Poubelle | Trash | Rubbish | Rubbish Bin"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Welcome to Geary."
-msgstr "Bienvenue dans Geary."
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Enter your account information to get started."
-msgstr "Saisissez vos informations de connexion pour commencer."
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Boîte de réception"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "2 weeks back"
-msgstr "il y a 2 semaines"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Brouillons"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "1 month back"
-msgstr "il y a 1 mois"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Messages envoyés"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "3 months back"
-msgstr "il y a 3 mois"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Marqués d'une étoile"
 
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "6 months back"
-msgstr "il y a 6 mois"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Importants"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "1 year back"
-msgstr "il y a 1 an"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Tous les messages"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-msgid "2 years back"
-msgstr "il y a 2 ans"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Pourriel"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-msgid "4 years back"
-msgstr "il y a 4 ans"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Corbeille"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "Everything"
-msgstr "Tout"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Boîte d'envoi"
 
-#: ../src/client/accounts/add-edit-page.vala:280
-msgid "Edit"
-msgstr "Éditer"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Recherche"
 
-#: ../src/client/accounts/add-edit-page.vala:282
-msgid "Preview"
-msgstr "Prévisualiser"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Archives"
 
-#: ../src/client/accounts/add-edit-page.vala:723
-msgid "Remem_ber passwords"
-msgstr "_Retenir les mots de passe"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Aucun"
 
-#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "_Retenir le mot de passe"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:764
-msgid "Unable to validate:\n"
-msgstr "Impossible de valider :\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:766
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Nom d'utilisateur invalide.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:769
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; Adresse électronique déjà ajoutée à Geary.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:773
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; Erreur de connexion IMAP.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:776
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; Mot de passe ou nom d'utilisateur IMAP incorrect.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Autre"
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; Erreur de connexion SMTP.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "attachment"
 
-#: ../src/client/accounts/add-edit-page.vala:782
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; Mot de passe ou nom d'utilisateur SMTP incorrect.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "cci"
 
-#: ../src/client/accounts/add-edit-page.vala:786
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Erreur de connexion.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "corps"
 
-#: ../src/client/accounts/add-edit-page.vala:790
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Mot de passe ou nom d'utilisateur incorrect.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "cc"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011-2015 Fondation Yorba"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "de"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Visiter le site Web de Yorba"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "objet"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Démarrer Geary en mode caché"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "à"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Afficher les informations de débogage"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "moi"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Journaliser la surveillance des conversations"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(pas d'objet)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Journaliser la désérialisation du réseau"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a %-e %b %Y à %-H:%M"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Journaliser l'activité du réseau"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "Le %1$s, %2$s a écrit :"
 
-#. / 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 "Journaliser la liste des événements IMAP"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s a écrit :"
 
-#. / 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 "Journaliser la sérialisation du réseau"
+#. / 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:234
+msgid "On %s:"
+msgstr "Le %s :"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Journaliser l'activité périodique"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Message transféré ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr ""
-"Journaliser les requêtes de la base de données (génère beaucoup de messages)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "De : %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Journaliser la normalisation des dossiers"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Objet : %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Autoriser l'inspection WebView"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Date : %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Supprimer tous les certificats avec avertissements TLS."
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "À : %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Afficher la version du programme"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Cc : %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Utilisez %s pour ouvrir une nouvelle fenêtre d'édition"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "aucun nom"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr ""
-"N'hésitez pas à envoyer vos commentaires, suggestions et rapports "
-"d'anomalies à :"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Client de messagerie"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Impossible d'analyser les options de ligne de commande : %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "Copyright 2011-2015 Fondation Yorba"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Option de ligne de commande « %s » inconnue\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Visiter le site Web de Yorba"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:61
 msgid "Delete conversation"
 msgstr "Supprimer la conversation"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Supprimer la conversation (Maj+Suppr)"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Supprimer les conversations (Maj+Suppr)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:67
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Mettre la conversation à la corbeille (Suppr, Retour arrière)"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:68
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "Mettre les conversations à la corbeille (Suppr, Retour arrière)"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Archiver"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Archiver la conversation (A)"
 
-#: ../src/client/application/geary-controller.vala:75
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Archiver les conversations (A)"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Marquer comme _pourriel"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Marquer comme non _pourriel"
 
-#: ../src/client/application/geary-controller.vala:81
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Marquer la conversation"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Marquer les conversations"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Ajouter une étiquette à la conversation"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Ajouter une étiquette aux conversations"
 
-#: ../src/client/application/geary-controller.vala:85
-#: ../src/client/application/geary-controller.vala:436
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Déplacer la conversation"
 
-#: ../src/client/application/geary-controller.vala:86
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Déplacer les conversations"
 
-#: ../src/client/application/geary-controller.vala:373
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "C_omptes"
 
-#: ../src/client/application/geary-controller.vala:378
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Préférences"
 
-#: ../src/client/application/geary-controller.vala:382
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "Aid_e"
 
-#: ../src/client/application/geary-controller.vala:386
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "À _propos"
 
-#: ../src/client/application/geary-controller.vala:390
-msgid "_Donate"
-msgstr "Faire un _don"
-
-#: ../src/client/application/geary-controller.vala:394
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../src/client/application/geary-controller.vala:399
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Marquer comme..."
 
-#: ../src/client/application/geary-controller.vala:405
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Marquer comme _lu"
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Marquer comme _non Lu"
 
-#: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "Ma_rquer d'une étoile"
 
-#: ../src/client/application/geary-controller.vala:422
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "_Supprimer l'étoile"
 
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Ajouter une étiquette"
 
-#: ../src/client/application/geary-controller.vala:433
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "É_tiqueter"
 
-#: ../src/client/application/geary-controller.vala:437
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Déplacer"
 
-#: ../src/client/application/geary-controller.vala:441
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Composer un nouveau message (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:445
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Répondre"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Répondre (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:450
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "R_épondre à tous"
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Répondre à tous (Ctrl+Maj+R, Maj+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Transférer"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Transférer (Ctr+L, F)"
 
-#: ../src/client/application/geary-controller.vala:496
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr "Vider"
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr "Vider les répertoires pourriels ou corbeille"
 
-#: ../src/client/application/geary-controller.vala:501
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr "Vider les pourriel_s…"
 
-#: ../src/client/application/geary-controller.vala:505
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr "Vider la _corbeille…"
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:538
+#: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
 msgstr "Afficher la barre de recherche"
 
-#: ../src/client/application/geary-controller.vala:752
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Impossible d'enregistrer l'exception de confiance pour le serveur"
 
-#: ../src/client/application/geary-controller.vala:989
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Vos paramètres ne sont pas sécurisés"
 
-#: ../src/client/application/geary-controller.vala:990
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -480,17 +453,17 @@ msgstr ""
 "Cela signifie qu'une autre personne sur votre réseau pourra avoir accès à "
 "vos identifiants. Voulez-vous vraiment continuer ?"
 
-#: ../src/client/application/geary-controller.vala:991
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "Co_ntinuer"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Erreur durant l'envoi"
 
-#: ../src/client/application/geary-controller.vala:1070
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -498,14 +471,12 @@ msgstr ""
 "Une erreur est apparue durant l'envoi d'un courriel. Si le problème "
 "persiste, supprimez manuellement ce message de la boîte d'envoi."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Erreur d'enregistrement du message envoyé"
 
-#: ../src/client/application/geary-controller.vala:1075
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -514,20 +485,15 @@ msgstr ""
 "dossier des messages envoyés. Le message restera dans la boîte d'envoi "
 "jusqu'à ce que vous le supprimiez."
 
-#: ../src/client/application/geary-controller.vala:1144
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Étiquettes"
 
-#. 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:1156
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Ouverture de la base de données de %s impossible"
 
-#: ../src/client/application/geary-controller.vala:1157
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -552,21 +518,19 @@ msgstr ""
 "jointes associées. <b>Les courriels présents sur le serveur ne seront pas "
 "affectés.</b>"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "_Reconstruire"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "_Quitter"
 
-#: ../src/client/application/geary-controller.vala:1168
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Reconstruction de la base de données de « %s » impossible"
 
-#: ../src/client/application/geary-controller.vala:1169
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -576,17 +540,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1191
-#: ../src/client/application/geary-controller.vala:1201
-#: ../src/client/application/geary-controller.vala:1212
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Ouverture de la boîte de messagerie locale de %s impossible"
 
-#: ../src/client/application/geary-controller.vala:1192
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -605,7 +565,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1202
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -619,7 +579,7 @@ msgstr ""
 "\n"
 "Veuillez installer la dernière version de Geary et de réessayer."
 
-#: ../src/client/application/geary-controller.vala:1213
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -631,14 +591,13 @@ msgstr ""
 "\n"
 "Vérifiez la connexion et redémarrez Geary."
 
-#: ../src/client/application/geary-controller.vala:1721
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "À propos de %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1724
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
 msgstr ""
 "ttoine <ttoine ttoine net>\n"
@@ -649,18 +608,20 @@ msgstr ""
 "merle <cendrelune lavache com>\n"
 "Philippe Bernery <pb mosca yahoo com>\n"
 "kalia35 <pmhoudry gmail com>\n"
-"Claude Paroz <claude 2xlibre net>"
+"Claude Paroz <claude 2xlibre net>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Cédric Bellegarde https://launchpad.net/~gnumdk";
 
-#: ../src/client/application/geary-controller.vala:1990
+#: ../src/client/application/geary-controller.vala:1976
 msgid "Undo move (Ctrl+Z)"
 msgstr "Annuler le déplacement (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2000
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Voulez-vous vraiment ouvrir « %s » ?"
 
-#: ../src/client/application/geary-controller.vala:2001
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -668,297 +629,534 @@ msgstr ""
 "L'ouverture de certaines pièces jointes peut endommager votre système. "
 "Veillez à n'ouvrir que les fichiers provenant de sources fiables."
 
-#: ../src/client/application/geary-controller.vala:2002
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Ne plus me _demander"
 
-#: ../src/client/application/geary-controller.vala:2020
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Un fichier nommé « %s » existe déjà. Voulez-vous le remplacer ?"
 
-#: ../src/client/application/geary-controller.vala:2022
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "Le fichier existe déjà dans « %s ». En le remplaçant, vous perdrez son "
 "contenu."
 
-#: ../src/client/application/geary-controller.vala:2025
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2323
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Fermer tous les brouillons ouverts ?"
 
-#: ../src/client/application/geary-controller.vala:2453
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr "Supprimer tous les courriels du dossier %s ?"
 
-#: ../src/client/application/geary-controller.vala:2454
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr "Supprime le mail de Geary et du serveur de mail."
 
-#: ../src/client/application/geary-controller.vala:2455
+#: ../src/client/application/geary-controller.vala:2441
 msgid "This cannot be undone."
 msgstr "L'action ne peut être annulée."
 
-#: ../src/client/application/geary-controller.vala:2456
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr "Vider %s"
 
-#: ../src/client/application/geary-controller.vala:2473
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 msgid "Error emptying %s"
 msgstr "Erreur au nettoyage de %s"
 
-#: ../src/client/application/geary-controller.vala:2503
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Voulez-vous supprimer définitivement ce message ?"
 msgstr[1] "Voulez-vous supprimer définitivement ces messages ?"
 
-#: ../src/client/application/geary-controller.vala:2505
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../src/client/application/geary-controller.vala:2536
+#: ../src/client/application/geary-controller.vala:2522
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Annuler archiver (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2551
+#: ../src/client/application/geary-controller.vala:2537
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Annuler mettre à la corbeille (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2604
+#: ../src/client/application/geary-controller.vala:2590
 msgid "Undo (Ctrl+Z)"
 msgstr "Annuler (Ctrl+Z)"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i correspondance"
-msgstr[1] "%i correspondances"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Démarrer Geary en mode caché"
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i correspondance"
-msgstr[1] "%i correspondances"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Afficher les informations de débogage"
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "non trouvé"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Journaliser la surveillance des conversations"
 
-#: ../src/client/components/main-window.vala:430
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Journaliser la désérialisation du réseau"
 
-#: ../src/client/components/search-bar.vala:10
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Recherche"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Journaliser l'activité du réseau"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:25
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Rechercher par mots-clés dans tous les messages du compte (Ctrl+S)"
+#. / 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 "Journaliser la liste des événements IMAP"
 
-#: ../src/client/components/search-bar.vala:118
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indexation du compte %s"
+#. / 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 "Journaliser la sérialisation du réseau"
 
-#: ../src/client/components/search-bar.vala:129
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Recherche dans le compte %s"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Journaliser l'activité périodique"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Envoi en cours..."
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr ""
+"Journaliser les requêtes de la base de données (génère beaucoup de messages)"
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_Valider"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Journaliser la normalisation des dossiers"
 
-#: ../src/client/components/stock.vala:19
-#: ../ui/edit_alternate_emails.glade.h:3 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Annuler"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Autoriser l'inspection WebView"
 
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Fermer"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Supprimer tous les certificats avec avertissements TLS."
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "A_bandonner"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Afficher la version du programme"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Ouvrir"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Utilisez %s pour ouvrir une nouvelle fenêtre d'édition"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "Im_primer..."
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+"N'hésitez pas à envoyer vos commentaires, suggestions et rapports "
+"d'anomalies à :"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Supprimer"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Impossible d'analyser les options de ligne de commande : %s\n"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "T_out sélectionner"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Option de ligne de commande « %s » inconnue\n"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Garder"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Nouveaux messages"
 
-#: ../src/client/composer/composer-widget.vala:73
-msgid "Saved"
-msgstr "Enregistré"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d nouveau message"
+msgstr[1] "%d nouveaux messages"
 
-#: ../src/client/composer/composer-widget.vala:74
-msgid "Saving"
-msgstr "Enregistrement"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d nouveau message au total"
+msgstr[1] "%s, %d nouveaux messages au total"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "Error saving"
-msgstr "Erreur d'enregistrement"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d nouveau message restant pour %s)"
+msgstr[1] ""
+"%s\n"
+"(%d nouveaux messages restants pour %s)"
 
-#: ../src/client/composer/composer-widget.vala:76
-msgid "Press Backspace to delete quote"
-msgstr "Appuyez sur Retour arrière pour supprimer la citation"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Ouvrir"
 
-#: ../src/client/composer/composer-widget.vala:77
-msgid "New Message"
-msgstr "Nouveau message"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Moi"
 
-#. A 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:138
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr "Connexion non certifiée : %s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
+"L'identité du serveur de courriel %s à %s:%u ne peut pas être vérifiée."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
 msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
-msgstr "pièce-jointe|joint|joindre|joins|attaché|attachement|fichier-joint"
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr ""
+"Sélectionner « Faire confiance à ce serveur » ou « Toujours faire confiance "
+"à ce serveur » peut conduire à la transmission de vos nom d'utilisateur et "
+"mot de passe de manière non sécurisée."
 
-#: ../src/client/composer/composer-widget.vala:1102
-#: ../src/client/composer/composer-widget.vala:1106
-msgid "Do you want to discard this message?"
-msgstr "Voulez-vous abandonner ce message ?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"Sélectionner « Ne pas faire confiance à ce serveur » empêchera Geary "
+"d'accéder à ce serveur."
 
-#: ../src/client/composer/composer-widget.vala:1262
-msgid "Send message with an empty subject and body?"
-msgstr "Envoyer le message avec un objet et un contenu vide ?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Geary n'ajoutera pas ni ne mettra à jour ce compte de messagerie."
 
-#: ../src/client/composer/composer-widget.vala:1264
-msgid "Send message with an empty subject?"
-msgstr "Envoyer le message avec un objet vide ?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"Sélectionner « Ne pas faire confiance à ce serveur » va empêcher l'accès de "
+"Geary à ce compte."
 
-#: ../src/client/composer/composer-widget.vala:1266
-msgid "Send message with an empty body?"
-msgstr "Envoyer le message avec un contenu vide ?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
+"Geary va se fermer si vous n'avez pas d'autre compte de messagerie ouvert."
 
-#: ../src/client/composer/composer-widget.vala:1268
-msgid "Send message without an attachment?"
-msgstr "Envoyer le message sans pièce jointe ?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Contactez votre administrateur système ou votre fournisseur de messagerie si "
+"vous avez des questions concernant ces problèmes."
 
-#: ../src/client/composer/composer-widget.vala:1530
-msgid "Cannot add attachment"
-msgstr "Impossible d'ajouter la pièce jointe"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr "Le certificat du serveur n'est pas signé par une autorité reconnue"
 
-#: ../src/client/composer/composer-widget.vala:1541
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "« %s » est introuvable."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr ""
+"L'identité du serveur ne correspond pas à celle renseignée par le certificat."
 
-#: ../src/client/composer/composer-widget.vala:1548
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "« %s » est un dossier."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Le certificat du serveur a expiré"
 
-#: ../src/client/composer/composer-widget.vala:1555
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "« %s » est un fichier vide."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "Le certificat du serveur n'a pas été activé"
 
-#: ../src/client/composer/composer-widget.vala:1569
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "« %s » n'a pas pu être lu."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "Le certificat du serveur a été révoqué et est maintenant non valide"
 
-#: ../src/client/composer/composer-widget.vala:1576
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "« %s » a déjà été joint au message."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "Le certificat du serveur est considéré comme non sécurisé"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1585
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr ""
+"Une erreur est survenue pendant l'échange de certificat avec le serveur"
 
-#: ../src/client/composer/composer-widget.vala:1645
-msgid "To: "
-msgstr "À :"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr "Geary a besoin de votre mot de passe pour continuer"
 
-#: ../src/client/composer/composer-widget.vala:1648
-msgid "Cc: "
-msgstr "Cc :"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Choisir un fichier"
 
-#: ../src/client/composer/composer-widget.vala:1651
-msgid "Bcc: "
-msgstr "Cci :"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Joindre"
 
-#: ../src/client/composer/composer-widget.vala:1654
-msgid "Reply-To: "
-msgstr "Répondre à :"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr "Adresses supplémentaires pour %s"
 
-#: ../src/client/composer/composer-widget.vala:1887
-msgid "Select Color"
-msgstr "Sélectionner une couleur"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Comptes"
 
-#. 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:2322
-#, c-format
-msgid "%1$s via %2$s"
-msgstr "%1$s via %2$s"
+#. / 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 "Prénom Nom"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2364
-msgid "_From:"
-msgstr "_De :"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Bienvenue dans Geary."
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Moi"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Saisissez vos informations de connexion pour commencer."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "il y a 2 semaines"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "il y a 1 mois"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "il y a 3 mois"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "il y a 6 mois"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "il y a 1 an"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "il y a 2 ans"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "il y a 4 ans"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Tout"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "Éditer"
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr "Prévisualiser"
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "_Retenir les mots de passe"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "_Retenir le mot de passe"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Impossible de valider :\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Nom d'utilisateur invalide.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Adresse électronique déjà ajoutée à Geary.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Erreur de connexion IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Mot de passe ou nom d'utilisateur IMAP incorrect.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Erreur de connexion SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; Mot de passe ou nom d'utilisateur SMTP incorrect.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Erreur de connexion.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Mot de passe ou nom d'utilisateur incorrect.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Enregistrer"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Ajouter"
+
+#. / 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 "Maintenant"
+
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "il y a %d min."
+msgstr[1] "il y a %d min."
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "il y a %d h."
+msgstr[1] "il y a %d h."
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Hier"
+
+#. / 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
+msgid "%A"
+msgstr "%A"
+
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "octets"
+
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "To"
+
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "Go"
+
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "Mo"
+
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "Ko"
+
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+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
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d non lu"
+msgstr[1] "%d non lus"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Boîtes de réception"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Recherche dans le compte %s"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d résultat"
+msgstr[1] "%d résultats"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "Aucune conversation sélectionnée."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "%u conversation sélectionnée."
@@ -1013,41 +1211,37 @@ msgid "Date:"
 msgstr "Date :"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "%u message lu"
 msgstr[1] "%u messages lus"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr ""
 "Ce message a été envoyé avec succès, mais n'a pas pu être enregistré dans %s."
 
-#. Add a menu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Copier"
 
-#. Add a menu item for copying the address.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "Copier l'_adresse électronique"
 
-#. Add a menu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Copier le _lien"
 
-#. Select message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "Sélectionner le _message"
 
-#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "T_out sélectionner"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "_Inspecter"
@@ -1060,7 +1254,6 @@ msgstr "Ce lien semble pointer vers"
 msgid "but actually goes to"
 msgstr "mais pointe plutôt vers"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
 msgstr " (Non valide ?)"
@@ -1083,12 +1276,10 @@ msgid_plural "Save All A_ttachments..."
 msgstr[0] "Enregistrer la pièce _jointe..."
 msgstr[1] "Enregistrer toutes les pièces _jointes..."
 
-#. Reply to all on a message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "Répondre à _tous"
 
-#. Mark as read/unread.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "Marquer comme l_u"
@@ -1101,1063 +1292,618 @@ msgstr "Marquer comme non l_u"
 msgid "Mark Unread From _Here"
 msgstr "Marquer comme non lu à partir d'_ici"
 
-#. Separator.
-#. View original message source.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "Voir la _source"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:378
-msgid "none"
-msgstr "aucun nom"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "Erreur lors de l'ouverture de l'éditeur de texte par défaut."
 
 #: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s - Inspecteur de conversation"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Choisir un fichier"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Enregistré"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Joindre"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Enregistrement"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
-msgid "Untrusted Connection: %s"
-msgstr "Connexion non certifiée : %s"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Erreur d'enregistrement"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
-msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr ""
-"L'identité du serveur de courriel %s à %s:%u ne peut pas être vérifiée."
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "Appuyez sur Retour arrière pour supprimer la citation"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
-msgid ""
-"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-"your username and password to be transmitted insecurely."
-msgstr ""
-"Sélectionner « Faire confiance à ce serveur » ou « Toujours faire confiance "
-"à ce serveur » peut conduire à la transmission de vos nom d'utilisateur et "
-"mot de passe de manière non sécurisée."
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Nouveau message"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-"server."
-msgstr ""
-"Sélectionner « Ne pas faire confiance à ce serveur » empêchera Geary "
-"d'accéder à ce serveur."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
+msgstr "pièce-jointe|joint|joindre|joins|attaché|attachement|fichier-joint"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
-msgid "Geary will not add or update this email account."
-msgstr "Geary n'ajoutera pas ni ne mettra à jour ce compte de messagerie."
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Voulez-vous abandonner ce message ?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-"this account."
-msgstr ""
-"Sélectionner « Ne pas faire confiance à ce serveur » va empêcher l'accès de "
-"Geary à ce compte."
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Envoyer le message avec un objet et un contenu vide ?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr ""
-"Geary va se fermer si vous n'avez pas d'autre compte de messagerie ouvert."
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Envoyer le message avec un objet vide ?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
-msgid ""
-"Contact your system administrator or email service provider if you have any "
-"question about these issues."
-msgstr ""
-"Contactez votre administrateur système ou votre fournisseur de messagerie si "
-"vous avez des questions concernant ces problèmes."
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Envoyer le message avec un contenu vide ?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
-msgstr "Le certificat du serveur n'est pas signé par une autorité reconnue"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Envoyer le message sans pièce jointe ?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
-msgid "The server's identity does not match the identity in the certificate"
-msgstr ""
-"L'identité du serveur ne correspond pas à celle renseignée par le certificat."
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Impossible d'ajouter la pièce jointe"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
-msgid "The server's certificate has expired"
-msgstr "Le certificat du serveur a expiré"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "« %s » est introuvable."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
-msgid "The server's certificate has not been activated"
-msgstr "Le certificat du serveur n'a pas été activé"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "« %s » est un dossier."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
-msgid "The server's certificate has been revoked and is now invalid"
-msgstr "Le certificat du serveur a été révoqué et est maintenant non valide"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "« %s » est un fichier vide."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
-msgid "The server's certificate is considered insecure"
-msgstr "Le certificat du serveur est considéré comme non sécurisé"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "« %s » n'a pas pu être lu."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
-msgid "An error has occurred processing the server's certificate"
-msgstr ""
-"Une erreur est survenue pendant l'échange de certificat avec le serveur"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "« %s » a déjà été joint au message."
 
-#. 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 "Geary requires your email password to continue"
-msgstr "Geary a besoin de votre mot de passe pour continuer"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. 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"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "À : "
 
-#. / 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 non lu"
-msgstr[1] "%d non lus"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Cc : "
 
-#. / 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/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Cci : "
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Boîtes de réception"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "Répondre à : "
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d résultat"
-msgstr[1] "%d résultats"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Sélectionner une couleur"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Nouveaux messages"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr "%1$s via %2$s"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d nouveau message"
-msgstr[1] "%d nouveaux messages"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_De :"
 
-#: ../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 nouveau message au total"
-msgstr[1] "%s, %d nouveaux messages au total"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 nouveau message restant pour %s)"
-msgstr[1] ""
-"%s\n"
-"(%d nouveaux messages restants pour %s)"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Envoi en cours..."
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Ouvrir"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i correspondance"
+msgstr[1] "%i correspondances"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i correspondance"
+msgstr[1] "%i correspondances"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "non trouvé"
 
-#. / 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"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_Valider"
 
-#. / 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"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Annuler"
 
-#. / 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"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Fermer"
 
-#. / 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"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "A_bandonner"
 
-#. / 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"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Ouvrir"
 
-#. / 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/components/stock.vala:28
+msgid "_Print..."
+msgstr "Im_primer..."
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Maintenant"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Supprimer"
 
-#: ../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "il y a %d min."
-msgstr[1] "il y a %d min."
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Garder"
 
-#: ../src/client/util/util-date.vala:171
-#, c-format
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "il y a %d h."
-msgstr[1] "il y a %d h."
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Rechercher par mots-clés dans tous les messages du compte (Ctrl+S)"
 
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "Hier"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Indexation du compte %s"
 
-#. / 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"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(pas d'objet)"
+#~ msgid "Geary Mail"
+#~ msgstr "Messagerie Geary"
 
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "octets"
+#~ msgid "Send and receive email"
+#~ msgstr "Envoyer et recevoir des courriels"
 
-#: ../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "To"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Email;E-mail;Messagerie;Courriels;"
 
-#: ../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "Go"
+#~ msgid "Compose Message"
+#~ msgstr "Écrire un message"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "Mo"
+#~ msgid "Send by email"
+#~ msgstr "Envoyer par courriel"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "Ko"
+#~ msgid "Send files using Geary"
+#~ msgstr "Envoyer des fichiers avec Geary"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#~ msgid "_Donate"
+#~ msgstr "Faire un _don"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Impossible de supprimer le "
+#~ "compte</span> "
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Une fenêtre d'édition associée à ce compte est ouverte. Envoyez ou "
+#~ "abandonnez le message en cours et réessayez."
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Autre"
+#~ msgid "Add account"
+#~ msgstr "Ajouter un compte"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#~ msgid "Edit account"
+#~ msgstr "Modifier le compte"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#~ msgid "Remove account"
+#~ msgstr "Supprimer le compte"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Boîte de réception"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Veuillez patienter pendant que Geary valide votre compte."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Brouillons"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Connexion non certifiée"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Messages envoyés"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "_Toujours faire confiance à ce serveur"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Marqués d'une étoile"
+#~ msgid "_Trust This Server"
+#~ msgstr "Faire _confiance à ce serveur"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Importants"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "Ne _pas faire confiance à ce serveur"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Tous les messages"
+#~ msgid "_Undo"
+#~ msgstr "A_nnuler"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Pourriel"
+#~ msgid "_Redo"
+#~ msgstr "_Rétablir"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Corbeille"
+#~ msgid "Cu_t"
+#~ msgstr "Co_uper"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Boîte d'envoi"
+#~ msgid "_Paste"
+#~ msgstr "Co_ller"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Archives"
+#~ msgid "_Left"
+#~ msgstr "Aligner à _gauche"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-msgstr "Aucun"
+#~ msgid "_Right"
+#~ msgstr "Aligner à _droite"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-msgid "attachment"
-msgstr "attachment"
+#~ msgid "_Center"
+#~ msgstr "_Centrer"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
-msgstr "cci"
+#~ msgid "_Justify"
+#~ msgstr "_Justifier"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
-msgstr "corps"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Lien (Ctrl+L)"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "cc"
-msgstr "cc"
+#~ msgid "C_olor"
+#~ msgstr "C_ouleur"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
-msgstr "de"
+#~ msgid "More options"
+#~ msgstr "Plus d'options"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-msgid "subject"
-msgstr "objet"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Indenter le texte (Ctrl+])"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
-msgstr "à"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Désindenter le texte (Ctrl+[)"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
-msgstr "moi"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Effacer la mise en forme (Ctrl+Espace)"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-msgid "Drafts | Draft"
-msgstr "Brouillons | Brouillon | Drafts | Draft"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Coller avec la _mise en forme"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr ""
-"Envoyés | Messages envoyés | Sent | Sent Mail | Sent Email | Sent E-Mail"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Gras (Ctrl+B)"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
-msgstr ""
-"Pourriel | Pourriels | Indésirables | Messages indésirables | Junk | Spam | "
-"Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email | Bulk E-Mail"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Italique (Ctrl+I)"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Corbeille | Poubelle | Trash | Rubbish | Rubbish Bin"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Souligné (Ctrl+U)"
 
-#. / 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:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a %-e %b %Y à %-H:%M"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Barré (Ctrl+K)"
 
-#. / 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:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "Le %1$s, %2$s a écrit :"
+#~ msgid "_Rich Text"
+#~ msgstr "Texte _riche"
 
-#. / 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:228
-#, c-format
-msgid "%s wrote:"
-msgstr "%s a écrit :"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Afficher plus de champs"
 
-#. / 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:234
-#, c-format
-msgid "On %s:"
-msgstr "Le %s :"
+#~ msgctxt "Label"
+#~ msgid "Close and Save"
+#~ msgstr "Fermer et enregistrer"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Message transféré ----------"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "Fermer et enregistrer"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "De : %s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "Fermer et enregistrer"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Objet : %s\n"
+#~ msgctxt "Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Fermer et abandonner"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "Date : %s\n"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Fermer et abandonner"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "À : %s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "Fermer et abandonner"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Cc : %s\n"
+#~ msgid "Lar_ge"
+#~ msgstr "_Grand"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Impossible de supprimer le compte</"
-"span>"
+#~ msgid "Large"
+#~ msgstr "Grand"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Une fenêtre d'édition associée à ce compte est ouverte. Envoyez ou abandonnez "
-"le message en cours et réessayez."
+#~ msgid "_Medium"
+#~ msgstr "_Moyen"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Ajouter un compte"
+#~ msgid "Medium"
+#~ msgstr "Moyen"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Modifier le compte"
+#~ msgid "_Small"
+#~ msgstr "_Petit"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Supprimer le compte"
+#~ msgid "Small"
+#~ msgstr "Petit"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Veuillez patienter pendant que Geary valide votre compte."
+#~ msgid "S_ans Serif"
+#~ msgstr "S_ans Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Connexion non certifiée"
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "_Toujours faire confiance à ce serveur"
+#~ msgid "S_erif"
+#~ msgstr "S_erif"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "Faire _confiance à ce serveur"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "Ne _pas faire confiance à ce serveur"
+#~ msgid "_Fixed Width"
+#~ msgstr "_Largeur fixe"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "A_nnuler"
-
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Rétablir"
-
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "Co_uper"
-
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "Co_ller"
-
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "Aligner à _gauche"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "Aligner à _droite"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Centrer"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Justifier"
-
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Lien (Ctrl+L)"
-
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "C_ouleur"
-
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Plus d'options"
-
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Indenter le texte (Ctrl+])"
-
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Désindenter le texte (Ctrl+[)"
-
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Effacer la mise en forme (Ctrl+Espace)"
-
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Coller avec la _mise en forme"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Gras (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Italique (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Souligné (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Barré (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "Texte _riche"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Afficher plus de champs"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "Fermer et enregistrer"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "Fermer et enregistrer"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "Fermer et enregistrer"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "Fermer et abandonner"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "Fermer et abandonner"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "Fermer et abandonner"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "_Grand"
-
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "Grand"
-
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "_Moyen"
-
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "Moyen"
-
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "_Petit"
-
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "Petit"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
-
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "S_erif"
-
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "Serif"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "_Largeur fixe"
-
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "Largeur fixe"
-
-#: ../ui/composer.glade.h:42
-msgid "Detach"
-msgstr "Détacher"
-
-#: ../ui/composer.glade.h:43
-msgid "Detach (Ctrl+D)"
-msgstr "Détacher (Ctrl+D)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_Envoyer"
-
-#: ../ui/composer.glade.h:45
-msgid "Send"
-msgstr "_Envoyer"
-
-#: ../ui/composer.glade.h:46
-msgid "Send (Ctrl+Enter)"
-msgstr "Envoyer (Ctrl+Entrée)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "_Ajouter une pièce jointe"
-
-#: ../ui/composer.glade.h:48
-msgid "Attach File"
-msgstr "_Ajouter une pièce jointe"
-
-#: ../ui/composer.glade.h:49
-msgid "_Include Original Attachments"
-msgstr "_Inclure les pièces jointes d'origine"
-
-#: ../ui/composer.glade.h:50
-msgid "Include Original Attachments"
-msgstr "_Inclure les pièces jointes d'origine"
-
-#: ../ui/composer.glade.h:51
-msgid "Application Menu"
-msgstr "Menu de l'application"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:53
-msgid "_To"
-msgstr "_À :"
-
-#: ../ui/composer.glade.h:54
-msgid "_Cc"
-msgstr "_Cc :"
-
-#: ../ui/composer.glade.h:55
-msgid "_Subject"
-msgstr "_Objet :"
-
-#: ../ui/composer.glade.h:56
-msgid "_Bcc"
-msgstr "_Cci :"
-
-#: ../ui/composer.glade.h:57
-msgid "_Reply-To"
-msgstr "_Répondre à"
-
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:59
-msgid "From"
-msgstr "De :"
+#~ msgid "Fixed Width"
+#~ msgstr "Largeur fixe"
 
-#: ../ui/composer.glade.h:60
-msgid "Drop files here"
-msgstr "Déposer des fichiers ici"
+#~ msgid "Detach"
+#~ msgstr "Détacher"
 
-#: ../ui/composer.glade.h:61
-msgid "To add them as attachments"
-msgstr "Pour les ajouter en tant que pièces jointes"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Détacher (Ctrl+D)"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-msgid "Remove email address"
-msgstr "Supprimer l'adresse électronique"
+#~ msgid "_Send"
+#~ msgstr "_Envoyer"
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"Certains services de courrier électronique nécessitent qu'une adresse supplémentaire soit configurée sur le 
serveur. Contactez votre fournisseur de courrier électronique pour plus d'informations."
+#~ msgid "Send"
+#~ msgstr "_Envoyer"
 
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "Mettre à jo_ur"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Envoyer (Ctrl+Entrée)"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Chercher :"
+#~ msgid "_Attach File"
+#~ msgstr "_Ajouter une pièce jointe"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Précédent"
+#~ msgid "Attach File"
+#~ msgstr "_Ajouter une pièce jointe"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Suivant"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Inclure les pièces jointes d'origine"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Sensible à la casse"
+#~ msgid "Include Original Attachments"
+#~ msgstr "_Inclure les pièces jointes d'origine"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "étiquette"
+#~ msgid "Application Menu"
+#~ msgstr "Menu de l'application"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Mot de passe"
+#~ msgid "_To"
+#~ msgstr "_À :"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "_Adresse électronique"
+#~ msgid "_Cc"
+#~ msgstr "_Cc :"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "Mot de _passe"
+#~ msgid "_Subject"
+#~ msgstr "_Objet :"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "S_ervice"
+#~ msgid "_Bcc"
+#~ msgstr "_Cci :"
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "_Nom"
+#~ msgid "_Reply-To"
+#~ msgstr "_Répondre à"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "Nom d'ut_ilisateur"
+#~ msgid "From"
+#~ msgstr "De :"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Travail, Maison, etc."
+#~ msgid "Drop files here"
+#~ msgstr "Déposer des fichiers ici"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_Enregistrer les messages envoyés"
+#~ msgid "To add them as attachments"
+#~ msgstr "Pour les ajouter en tant que pièces jointes"
 
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
-msgstr "Adresses de messagerie supplémenta_ires"
+#~ msgid "Remove email address"
+#~ msgstr "Supprimer l'adresse électronique"
 
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "Configuration IMAP"
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "Certains services de courrier électronique nécessitent qu'une adresse "
+#~ "supplémentaire soit configurée sur le serveur. Contactez votre fournisseur "
+#~ "de courrier électronique pour plus d'informations."
 
-#: ../ui/login.glade.h:12
-msgid "Se_rver"
-msgstr "Se_rveur"
+#~ msgid "_Update"
+#~ msgstr "Mettre à jo_ur"
 
-#: ../ui/login.glade.h:13
-msgid "P_ort"
-msgstr "P_ort"
+#~ msgid "Find:"
+#~ msgstr "Chercher :"
 
-#: ../ui/login.glade.h:14
-msgid "Ser_ver"
-msgstr "Ser_veur"
+#~ msgid "_Previous"
+#~ msgstr "_Précédent"
 
-#: ../ui/login.glade.h:15
-msgid "Por_t"
-msgstr "Por_t"
+#~ msgid "_Next"
+#~ msgstr "_Suivant"
 
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "Configuration SMTP"
+#~ msgid "_Case sensitive"
+#~ msgstr "_Sensible à la casse"
 
-#: ../ui/login.glade.h:17
-msgid "User_name"
-msgstr "_Identifiant"
+#~ msgid "label"
+#~ msgstr "étiquette"
 
-#: ../ui/login.glade.h:18
-msgid "Pass_word"
-msgstr "Mot de p_asse"
+#~ msgid "Password"
+#~ msgstr "Mot de passe"
 
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr "Identifiant SMTP"
+#~ msgid "E_mail address"
+#~ msgstr "_Adresse électronique"
 
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr "Mot de passe SMTP"
+#~ msgid "_Password"
+#~ msgstr "Mot de _passe"
 
-#: ../ui/login.glade.h:21
-msgid "_Username"
-msgstr "_Identifiant"
+#~ msgid "S_ervice"
+#~ msgstr "S_ervice"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr "Identifiant IMAP"
+#~ msgid "N_ame"
+#~ msgstr "_Nom"
 
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr "Mot de passe IMAP"
+#~ msgid "N_ickname"
+#~ msgstr "Nom d'ut_ilisateur"
 
-#: ../ui/login.glade.h:24
-msgid "Encr_yption"
-msgstr "_Chiffrement"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Travail, Maison, etc."
 
-#: ../ui/login.glade.h:25
-msgid "Encrypt_ion"
-msgstr "C_hiffrement"
+#~ msgid "_Save sent mail"
+#~ msgstr "_Enregistrer les messages envoyés"
 
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "Adresses de messagerie supplémenta_ires"
 
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "IMAP settings"
+#~ msgstr "Configuration IMAP"
 
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "L'authentification n'est pas re_quise"
+#~ msgid "Se_rver"
+#~ msgstr "Se_rveur"
 
-#: ../ui/login.glade.h:30
-msgid "Use IMAP cre_dentials"
-msgstr "Utiliser les i_dentifiants IMAP"
+#~ msgid "P_ort"
+#~ msgstr "P_ort"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Éditeur"
+#~ msgid "Ser_ver"
+#~ msgstr "Ser_veur"
 
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr "Sauvegarder les _brouillons sur le serveur"
+#~ msgid "Por_t"
+#~ msgstr "Por_t"
 
-#: ../ui/login.glade.h:33
-msgid "Si_gn emails (HTML allowed):"
-msgstr "_Signer les messages (HTML autorisé) :"
+#~ msgid "SMTP settings"
+#~ msgstr "Configuration SMTP"
 
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "Stockage"
+#~ msgid "User_name"
+#~ msgstr "_Identifiant"
 
-#: ../ui/login.glade.h:35
-msgid "_Download mail"
-msgstr "_Télécharger les messages"
+#~ msgid "Pass_word"
+#~ msgstr "Mot de p_asse"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "Identifiants SMTP"
+#~ msgid "SMTP username"
+#~ msgstr "Identifiant SMTP"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "Identifiant"
+#~ msgid "SMTP password"
+#~ msgstr "Mot de passe SMTP"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Se rappeler du mot de passe"
+#~ msgid "_Username"
+#~ msgstr "_Identifiant"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Authentifier"
+#~ msgid "IMAP username"
+#~ msgstr "Identifiant IMAP"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Lecture"
+#~ msgid "IMAP password"
+#~ msgstr "Mot de passe IMAP"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "Sélectionner _automatiquement le message suivant"
+#~ msgid "Encr_yption"
+#~ msgstr "_Chiffrement"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "A_fficher l'aperçu de la conversation"
+#~ msgid "Encrypt_ion"
+#~ msgstr "C_hiffrement"
 
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr "Utiliser la vue à _trois panneaux"
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "Activer la _vérification orthographique"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "Notifications"
+#~ msgid "No authentication re_quired"
+#~ msgstr "L'authentification n'est pas re_quise"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "_Jouer les sons de notification"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Utiliser les i_dentifiants IMAP"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "Afficher les _notifications de nouveaux messages"
+#~ msgid "Composer"
+#~ msgstr "Éditeur"
 
-#: ../ui/preferences.glade.h:10
-msgid "Always _watch for new mail"
-msgstr "Toujours _vérifier s'il y a de nouveaux messages"
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Sauvegarder les _brouillons sur le serveur"
 
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr ""
-"Geary va tourner en arrière-plan et notifier l'arrivée de nouveaux messages"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "_Signer les messages (HTML autorisé) :"
 
-#: ../ui/preferences.glade.h:12
-msgid "Preferences"
-msgstr "Préférences"
+#~ msgid "Storage"
+#~ msgstr "Stockage"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Voulez-vous vraiment supprimer ce "
-"compte ?</span>"
+#~ msgid "_Download mail"
+#~ msgstr "_Télécharger les messages"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Tous les courriels associés à ce compte seront supprimés de votre "
-"ordinateur. Ceux présents sur le serveur ne seront pas affectés."
+#~ msgid "SMTP Credentials"
+#~ msgstr "Identifiants SMTP"
+
+#~ msgid "Username"
+#~ msgstr "Identifiant"
+
+#~ msgid "_Remember password"
+#~ msgstr "_Se rappeler du mot de passe"
+
+#~ msgid "_Authenticate"
+#~ msgstr "_Authentifier"
+
+#~ msgid "Reading"
+#~ msgstr "Lecture"
+
+#~ msgid "_Automatically select next message"
+#~ msgstr "Sélectionner _automatiquement le message suivant"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "A_fficher l'aperçu de la conversation"
+
+#~ msgid "Use _three pane view"
+#~ msgstr "Utiliser la vue à _trois panneaux"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Activer la _vérification orthographique"
+
+#~ msgid "Notifications"
+#~ msgstr "Notifications"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Jouer les sons de notification"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Afficher les _notifications de nouveaux messages"
+
+#~ msgid "Always _watch for new mail"
+#~ msgstr "Toujours _vérifier s'il y a de nouveaux messages"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr ""
+#~ "Geary va tourner en arrière-plan et notifier l'arrivée de nouveaux messages"
+
+#~ msgid "Preferences"
+#~ msgstr "Préférences"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Voulez-vous vraiment supprimer ce "
+#~ "compte ?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Tous les courriels associés à ce compte seront supprimés de votre "
+#~ "ordinateur. Ceux présents sur le serveur ne seront pas affectés."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Nom d'utilisateur :"
+#~ msgid "Nickname:"
+#~ msgstr "Nom d'utilisateur :"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Adresse électronique :"
+#~ msgid "Email address:"
+#~ msgstr "Adresse électronique :"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Mise à jour de Geary en cours…"
+#~ msgid "Geary update in progress…"
+#~ msgstr "Mise à jour de Geary en cours…"
diff --git a/po/gl.po b/po/gl.po
index 2fd7766..a9ff94e 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,386 +10,424 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-07 01:59+0100\n"
-"PO-Revision-Date: 2014-02-07 02:01+0200\n"
-"Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:03+0000\n"
+"Last-Translator: Fran Diéguez <Unknown>\n"
 "Language-Team: gnome-l10n-gl gnome org\n"
-"Language: gl\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: Virtaal 0.7.1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:54+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: gl\n"
 
-#: ../desktop/geary.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr ""
 
-#: ../desktop/geary.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Cliente de correo"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
 
-#: ../desktop/geary.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Correo Geary"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
 
-#: ../desktop/geary.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Enviar e recibir correo"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr ""
 
-#: ../desktop/geary.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Correo electrónico;Correo-e;Correo;"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Redactar unha mensaxe"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Bandexa de entrada"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Gardar"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Borradores"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Engadir"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Correo enviado"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:19
-msgid "Accounts"
-msgstr "Contas"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Destacados"
 
-#. / 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 "Nome e apelido"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Importante"
 
-#: ../src/client/accounts/add-edit-page.vala:196
-#, c-format
-msgid "Welcome to Geary."
-msgstr "Benvido/a a Geary"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Todo o correo"
 
-#: ../src/client/accounts/add-edit-page.vala:196
-msgid "Enter your account information to get started."
-msgstr "Introduza a información da súa conta para comezar. "
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Correo lixo"
 
-#: ../src/client/accounts/add-edit-page.vala:217
-msgid "2 weeks back"
-msgstr "Hai 2 semanas"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Lixo"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:218
-msgid "1 month back"
-msgstr "Hai 1 mes"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Bandexa de saída"
 
-#: ../src/client/accounts/add-edit-page.vala:219
-msgid "3 months back"
-msgstr "Hai 3 meses"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Buscar"
 
-#: ../src/client/accounts/add-edit-page.vala:220
-msgid "6 months back"
-msgstr "Hai 6 meses"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Arquivo"
 
-#: ../src/client/accounts/add-edit-page.vala:221
-msgid "1 year back"
-msgstr "Hai 1 ano"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Ningún"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:223
-msgid "Everything"
-msgstr "Todo"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:599
-msgid "Remem_ber passwords"
-msgstr "Lem_brar os contrasinais"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:606 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "Lem_brar o contrasinal"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:635
-msgid "Unable to validate:\n"
-msgstr "Non foi posíbel confirmar:\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Correo de Yahoo!"
 
-#: ../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Alcume da conta incorrecto.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:640
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; Enderezo de correo xa engadido no Geary.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Outro"
 
-#: ../src/client/accounts/add-edit-page.vala:644
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; Produciuse un erro de conexión IMAP.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "anexo"
 
-#: ../src/client/accounts/add-edit-page.vala:647
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; Nome de usuario ou contrasinal de IMAP incorrecto.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "cco"
 
-#: ../src/client/accounts/add-edit-page.vala:650
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; Produciuse un erro de conexión SMTP.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "corpo"
 
-#: ../src/client/accounts/add-edit-page.vala:653
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; Nome de usuario ou contrasinal de SMTP incorrecto.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "cc"
 
-#: ../src/client/accounts/add-edit-page.vala:657
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Produciuse un erro de conexión.\n"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "desde"
 
-#: ../src/client/accounts/add-edit-page.vala:661
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Nome de usuario ou contrasinal incorrecto.\n"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "asunto"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2014 Yorba Foundation"
-msgstr "Copyright 2011-2014 Yorba Foundation"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "para"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Visite o sitio web de Yorba"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr ""
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Output debugging information"
-msgstr "Saída de información da depuración"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(sen asunto)"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Log conversation monitoring"
-msgstr "Rexistrar a monitorización das conversas"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %-e de %b do %Y ás %-l:%M %p"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log network deserialization"
-msgstr "Rexistrar a deserialización da rede"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "O %1$s, %2$s escribiu:"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network activity"
-msgstr "Rexistrara a actividade da rede"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s escribiu:"
 
-#. / 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:16
-msgid "Log IMAP replay queue"
-msgstr "Rexistrar a cola de repetición IMAP"
+#. / 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:234
+msgid "On %s:"
+msgstr "O %s:"
 
-#. / Serialization is how commands and responses are converted into a stream of bytes for
-#. / network transmission
-#: ../src/client/application/geary-args.vala:19
-msgid "Log network serialization"
-msgstr "Rexistrar a serialización da rede"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Mensaxe reenviada ----------"
 
-#: ../src/client/application/geary-args.vala:20
-msgid "Log periodic activity"
-msgstr "Rexistrara a actividade periódica"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "De: %s\n"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log database queries (generates lots of messages)"
-msgstr "Rexistrar as consultas á base de datos (xera moitas mensaxes)"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Asunto: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:23
-msgid "Log folder normalization"
-msgstr "Rexistrar a normalización de cartafoles"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Data: %s\n"
 
-#: ../src/client/application/geary-args.vala:24
-msgid "Allow inspection of WebView"
-msgstr "Permitir a inspección de WebView"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Para: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Display program version"
-msgstr "Amosar a versión do programa"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Cc: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:47
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Usar %s para abrir unha nova xanela de composición"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "ningún"
 
-#: ../src/client/application/geary-args.vala:48
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Envíe comentarios, suxestións e fallos a:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Cliente de correo"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:55
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Produciuse un error ao interpretar as opcións da liña de ordes: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
 
-#: ../src/client/application/geary-args.vala:66
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Opción de liña de ordes «%s» descoñecida\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Visite o sitio web de Yorba"
 
-#: ../src/client/application/geary-controller.vala:46
-msgid "_Delete"
-msgstr "_Eliminar"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:47
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Eliminar conversa (Maiús+Supr)"
 
-#: ../src/client/application/geary-controller.vala:48
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Eliminar conversas (Maiús+Supr)"
 
-#: ../src/client/application/geary-controller.vala:51
-msgid "_Trash"
-msgstr "_Lixo"
-
-#: ../src/client/application/geary-controller.vala:52
-msgid "Move conversation to trash (Delete, Backspace)"
-msgstr "Mover conversa ao lixo (Supr, Retroceso)"
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:53
-msgid "Move conversations to trash (Delete, Backspace)"
-msgstr "Mover conversas ao lixo (Supr, Retroceso)"
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:56
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Arquivo"
 
-#: ../src/client/application/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Arquivar conversa (A)"
 
-#: ../src/client/application/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Arquivar conversas (A)"
 
-#: ../src/client/application/geary-controller.vala:61
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Marcar como li_xo"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Marcar como _non é lixo"
 
-#: ../src/client/application/geary-controller.vala:64
-#: ../src/client/application/geary-controller.vala:275
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Marcar a conversa"
 
-#: ../src/client/application/geary-controller.vala:65
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Marcar as conversas"
 
-#: ../src/client/application/geary-controller.vala:66
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Engadir etiqueta á conversa"
 
-#: ../src/client/application/geary-controller.vala:67
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Engadir etiqueta ás conversas"
 
-#: ../src/client/application/geary-controller.vala:68
-#: ../src/client/application/geary-controller.vala:314
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Mover a conversa"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Mover as conversas"
 
-#: ../src/client/application/geary-controller.vala:251
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "_Contas"
 
-#: ../src/client/application/geary-controller.vala:256
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../src/client/application/geary-controller.vala:260
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Axuda"
 
-#: ../src/client/application/geary-controller.vala:264
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../src/client/application/geary-controller.vala:268
-msgid "_Donate"
-msgstr "_Facer unha doazon"
-
-#: ../src/client/application/geary-controller.vala:272
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Saír"
 
-#: ../src/client/application/geary-controller.vala:277
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Marcar como..."
 
-#: ../src/client/application/geary-controller.vala:283
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Marcar como _lido"
 
-#: ../src/client/application/geary-controller.vala:289
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Marcar como _sen ler"
 
-#: ../src/client/application/geary-controller.vala:295
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Estrela"
 
-#: ../src/client/application/geary-controller.vala:300
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "_Non destacar"
 
-#: ../src/client/application/geary-controller.vala:310
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Engadir etiqueta"
 
-#: ../src/client/application/geary-controller.vala:311
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Etiqueta"
 
-#: ../src/client/application/geary-controller.vala:315
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../src/client/application/geary-controller.vala:319
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Redactar unha nova mensaxe (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:323
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1561
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../src/client/application/geary-controller.vala:324
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Responder (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:328
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "R_esponder a todos"
 
-#: ../src/client/application/geary-controller.vala:329
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Responder a todos (Ctrl+Maiús+R, Maiús+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:334
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1571
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Avanzar (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:618
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:746
+msgid "Unable to store server trust exception"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "A súa configuración non é segura"
 
-#: ../src/client/application/geary-controller.vala:619
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -399,17 +437,17 @@ msgstr ""
 "que o seu nome de usuario e contrasinal poderían seren lidos por outra "
 "persoa na mesma rede. Confirma que quere facer isto?"
 
-#: ../src/client/application/geary-controller.vala:620
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "Co_ntinuar"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:698
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Produciuse un erro ao enviar o correo"
 
-#: ../src/client/application/geary-controller.vala:699
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -417,14 +455,12 @@ msgstr ""
 "Geary detectou un erro ao enviar un correo. De persistir o problema, elimine "
 "manualmente o correo do cartafol Bandexa de saída."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:703
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Produciuse un erro ao enviar o correo"
 
-#: ../src/client/application/geary-controller.vala:704
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -432,17 +468,15 @@ msgstr ""
 "Geary detectou un erro ao gardar un correo enviado en «Correo enviado». O "
 "mensaxe permanecerá no seu cartafol de «Bandexa de saída» ate que o elimine."
 
-#: ../src/client/application/geary-controller.vala:773
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: ../src/client/application/geary-controller.vala:785
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Non é posíbel abrir a base de datos para %s"
 
-#: ../src/client/application/geary-controller.vala:786
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -466,21 +500,19 @@ msgstr ""
 "A reconstrución da base de datos destruirá todo o correo local e os seus "
 "anexos. <b>O correo no servidor non será alterado.</b>"
 
-#: ../src/client/application/geary-controller.vala:788
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "_Reconstruír"
 
-#: ../src/client/application/geary-controller.vala:788
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "_Saír"
 
-#: ../src/client/application/geary-controller.vala:797
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Non é posíbel reconstruír a base de datos para «%s»"
 
-#: ../src/client/application/geary-controller.vala:798
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -490,15 +522,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:820
-#: ../src/client/application/geary-controller.vala:830
-#: ../src/client/application/geary-controller.vala:841
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Non é posíbel abrir a caixa de correo para %s"
 
-#: ../src/client/application/geary-controller.vala:821
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -516,7 +546,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:831
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -530,7 +560,7 @@ msgstr ""
 "\n"
 "Instale a última versión do Geary e tenteo de novo."
 
-#: ../src/client/application/geary-controller.vala:842
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -542,25 +572,30 @@ msgstr ""
 "\n"
 "Comprobe a conexión de rede e reinicie o Geary."
 
-#: ../src/client/application/geary-controller.vala:1324
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "Sobre %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1327
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
 msgstr ""
 "Miguel Anxo Bouzada <mbouzada gmail com>\n"
-"Proxecto Trasno <proxecto trasno net>"
+"Proxecto Trasno <proxecto trasno net>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Fran Diéguez https://launchpad.net/~frandieguez";
+
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1584
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Confirma que quere abrir «%s»?"
 
-#: ../src/client/application/geary-controller.vala:1585
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -568,453 +603,375 @@ msgstr ""
 "Os ficheiros anexos poderían causar danos no seu sistema. Abra só ficheiros "
 "de orixes fiábeis."
 
-#: ../src/client/application/geary-controller.vala:1586
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Non _preguntar de novo"
 
-#: ../src/client/application/geary-controller.vala:1604
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Xa existe un ficheiro co nome «%s».  Desexa substituílo?"
 
-#: ../src/client/application/geary-controller.vala:1606
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "O ficheiro xa existe en «%s». Ao substituílo sobrescribirá os seus contidos."
 
-#: ../src/client/application/geary-controller.vala:1609
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Substituír"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i aparición"
-msgstr[1] "%i aparicións"
-
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i coincidencia (desde o principio)"
-msgstr[1] "%i coincidencias (desde o principio)"
-
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "non atopado"
-
-#: ../src/client/components/main-toolbar.vala:11
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Buscar"
+#: ../src/client/application/geary-controller.vala:2309
+msgid "Close open draft messages?"
+msgstr ""
 
-#: ../src/client/components/main-toolbar.vala:84
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Buscar en todas as mensaxes da conta por palabras clave (Ctrl+S)"
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
 
-#: ../src/client/components/main-toolbar.vala:205
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indexando %s conta(s)"
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
 
-#: ../src/client/components/main-toolbar.vala:212
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Buscar na conta %s"
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
+msgstr ""
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Enviando..."
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_Aceptar"
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
+msgstr ""
 
-#: ../src/client/components/stock.vala:19 ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Cancelar"
+#: ../src/client/application/geary-controller.vala:2489
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/client/components/stock.vala:23 ../ui/account_list.glade.h:4
-#: ../ui/composer.glade.h:46 ../ui/preferences.glade.h:1
-msgid "_Close"
-msgstr "_Pechar"
+#: ../src/client/application/geary-controller.vala:2491
+msgid "Delete"
+msgstr ""
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Desbotar"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Abrir"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "Im_primir..."
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Retirar"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr ""
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1031
-msgid "Select _All"
-msgstr "Seleccionar _todo"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Saída de información da depuración"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Conservar"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Rexistrar a monitorización das conversas"
 
-#: ../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "Mensaxe nova"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Rexistrar a deserialización da rede"
 
-#: ../src/client/composer/composer-window.vala:41
-msgid "Saved"
-msgstr "Gardado"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Rexistrara a actividade da rede"
 
-#: ../src/client/composer/composer-window.vala:42
-msgid "Saving"
-msgstr "Gardando"
+#. / 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 "Rexistrar a cola de repetición IMAP"
 
-#: ../src/client/composer/composer-window.vala:43
-msgid "Error saving"
-msgstr "Produciuse un erro ao gardar"
+#. / 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 "Rexistrar a serialización da rede"
 
-#. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
-#: ../src/client/composer/composer-window.vala:95
-msgid "attach|enclosed|enclosing|cover letter"
-msgstr "anexo|incluído|engadido|carta de presentación"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Rexistrara a actividade periódica"
 
-#: ../src/client/composer/composer-window.vala:681
-msgid "Do you want to discard the unsaved message?"
-msgstr "Quere desbotar a mensaxe sen gardar?"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Rexistrar as consultas á base de datos (xera moitas mensaxes)"
 
-#: ../src/client/composer/composer-window.vala:684
-msgid "Do you want to discard this message?"
-msgstr "Confirma que quere desbotar esta mensaxe?"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Rexistrar a normalización de cartafoles"
 
-#: ../src/client/composer/composer-window.vala:761
-msgid "Send message with an empty subject and body?"
-msgstr "Enviar a mensaxe sen asunto e sen contido?"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Permitir a inspección de WebView"
 
-#: ../src/client/composer/composer-window.vala:763
-msgid "Send message with an empty subject?"
-msgstr "Enviar a mensaxe sen asunto?"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr ""
 
-#: ../src/client/composer/composer-window.vala:765
-msgid "Send message with an empty body?"
-msgstr "Enviar a mensaxe sen contido?"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Amosar a versión do programa"
 
-#: ../src/client/composer/composer-window.vala:767
-msgid "Send message without an attachment?"
-msgstr "Enviar a mensaxe sen anexo?"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Usar %s para abrir unha nova xanela de composición"
 
-#: ../src/client/composer/composer-window.vala:950
-msgid "Cannot add attachment"
-msgstr "Non é posíbel engadir o anexo"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Envíe comentarios, suxestións e fallos a:"
 
-#: ../src/client/composer/composer-window.vala:961
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "Non foi posíbel atopar «%s»."
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Produciuse un error ao interpretar as opcións da liña de ordes: %s\n"
 
-#: ../src/client/composer/composer-window.vala:968
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "«%s» é un cartafol."
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Opción de liña de ordes «%s» descoñecida\n"
 
-#: ../src/client/composer/composer-window.vala:975
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "«%s» é un ficheiro baleiro."
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Mensaxes novas"
 
-#: ../src/client/composer/composer-window.vala:989
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "Non foi posíbel abrir «%s» para a súa lectura."
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d mensaxe nova"
+msgstr[1] "%d mensaxes novas"
 
-#: ../src/client/composer/composer-window.vala:996
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "«%s» xa foi anexado para o envío."
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d nova mensaxe en total"
+msgstr[1] "%s, %d novas mensaxes en total"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-window.vala:1005
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d nova mensaxe para %s)"
+msgstr[1] ""
+"%s\n"
+"(outras %d novas mensaxes para %s)"
 
-#: ../src/client/composer/composer-window.vala:1267
-msgid "Select Color"
-msgstr "Escoller unha cor"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Aberto"
 
 #: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Eu"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:254
-msgid "No conversations selected."
-msgstr "Non hai ningunha conversa seleccionada."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:256
-#, c-format
-msgid "%u conversation selected."
-msgid_plural "%u conversations selected."
-msgstr[0] "%u conversa seleccionada."
-msgstr[1] "%u conversas seleccionadas."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:285
-msgid "No search results found."
-msgstr "Non se atoparon resultados de busca."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:287
-msgid "No conversations in folder."
-msgstr "Non hai conversas no cartafol."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:526
-msgid "This message contains remote images."
-msgstr "Esta mensaxe contén imaxes remotas."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:526
-msgid "Show Images"
-msgstr "Amosar as imaxes"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:527
-msgid "Always Show From Sender"
-msgstr "Amosar sempre o remitente"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:551
-msgid "Edit Draft"
-msgstr "Editar o borrador"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr ""
 
-#. Geary account mail will be sent from
-#: ../src/client/conversation-viewer/conversation-viewer.vala:624
-#: ../ui/composer.glade.h:41
-msgid "From:"
-msgstr "De:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
 
-#. Address(es) e-mail is to be sent to
-#: ../src/client/conversation-viewer/conversation-viewer.vala:627
-#: ../ui/composer.glade.h:36
-msgid "To:"
-msgstr "Para:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:630
-#: ../ui/composer.glade.h:37
-msgid "Cc:"
-msgstr "CC:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:633
-#: ../ui/composer.glade.h:39
-msgid "Bcc:"
-msgstr "CCO:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:636
-#: ../ui/composer.glade.h:38
-msgid "Subject:"
-msgstr "Asunto:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:639
-msgid "Date:"
-msgstr "Data:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:846
-#, c-format
-msgid "%u read message"
-msgid_plural "%u read messages"
-msgstr[0] "%u mensaxe lida"
-msgstr[1] "%u mensaxes lidas"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:978
-#, c-format
-msgid "This message was sent successfully, but could not be saved to %s."
-msgstr "Esta mensaxe foi enviada correctamente, porén non puido gardarse en %s."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr ""
 
-#. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1004
-#: ../ui/composer.glade.h:4
-msgid "_Copy"
-msgstr "_Copiar"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr ""
 
-#. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1012
-msgid "Copy _Email Address"
-msgstr "Copiar o _enderezo de correo"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr ""
 
-#. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1017
-#: ../ui/composer.glade.h:17
-msgid "Copy _Link"
-msgstr "Copiar a _ligazón"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1025
-msgid "Select _Message"
-msgstr "Seleccione a _mensaxe"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Escolla un ficheiro"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1037
-msgid "_Inspect"
-msgstr "_Inspeccionar"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Anexar"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1261
-msgid "This link appears to go to"
-msgstr "Semella que esta ligazón é para ir a"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1262
-msgid "but actually goes to"
-msgstr "mais realmente vai a"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Contas"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1317
-msgid " (Invalid?)"
-msgstr " (Incorrecto?)"
+#. / 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 "Nome e apelido"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1509
-msgid "_Save As..."
-msgstr "_Gardar como..."
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Benvido/a a Geary"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1514
-msgid "Save All A_ttachments..."
-msgstr "Gardar todos os ane_xos..."
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Introduza a información da súa conta para comezar."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1528
-msgid "_Save Image As..."
-msgstr "_Gardar a imaxe como..."
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "Hai 2 semanas"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1551
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "Gardar o ane_xo..."
-msgstr[1] "Gardar todos os ane_xos..."
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "Hai 1 mes"
 
-#. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1566
-msgid "Reply to _All"
-msgstr "Responder a _todos"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "Hai 3 meses"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1583
-msgid "_Mark as Read"
-msgstr "_Marcar como lido"
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "Hai 6 meses"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1587
-msgid "_Mark as Unread"
-msgstr "_Marcar como sen ler"
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "Hai 1 ano"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1593
-msgid "Mark Unread From _Here"
-msgstr "Marcar como non lido desde _aquí"
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr ""
 
-#. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1608
-msgid "_View Source"
-msgstr "_Ver o código fonte"
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr ""
 
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1913
-#: ../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "ningún"
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Todo"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2043
-msgid "Failed to open default text editor."
-msgstr "Produciuse un erro ao abrir o editor de textos predeterminado."
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-web-view.vala:293
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - Inspector de conversas"
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Escolla un ficheiro"
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "Lem_brar os contrasinais"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Anexar"
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "Lem_brar o contrasinal"
 
-#: ../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your password"
-msgstr "Escriba o seu contrasinal"
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Non foi posíbel confirmar:\n"
 
-#. Label displaying total number of email messages in a folder
-#: ../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] "%d mensaxe"
-msgstr[1] "%d mensaxes"
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Alcume da conta incorrecto.\n"
 
-#. / 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 sen ler"
-msgstr[1] "%d sen ler"
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Enderezo de correo xa engadido no Geary.\n"
 
-#. / 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"
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Produciuse un erro de conexión IMAP.\n"
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Bandexas de entrada"
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Nome de usuario ou contrasinal de IMAP incorrecto.\n"
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d resultado"
-msgstr[1] "%d resultados"
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Produciuse un erro de conexión SMTP.\n"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Mensaxes novas"
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; Nome de usuario ou contrasinal de SMTP incorrecto.\n"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d mensaxe nova"
-msgstr[1] "%d mensaxes novas"
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Produciuse un erro de conexión.\n"
 
-#: ../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 nova mensaxe en total"
-msgstr[1] "%s, %d novas mensaxes en total"
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Nome de usuario ou contrasinal incorrecto.\n"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 nova mensaxe para %s)"
-msgstr[1] ""
-"%s\n"
-"(outras %d novas mensaxes para %s)"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Gardar"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Aberto"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Engadir"
 
 #. / 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
@@ -1072,35 +1029,27 @@ msgid "Now"
 msgstr "Agora"
 
 #: ../src/client/util/util-date.vala:167
-#, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
 msgstr[0] "Fai %dm"
 msgstr[1] "Fai %dm"
 
-#: ../src/client/util/util-date.vala:170
-#, c-format
+#: ../src/client/util/util-date.vala:171
 msgid "%dh ago"
 msgid_plural "%dh ago"
 msgstr[0] "Fai %dh"
 msgstr[1] "Fai %dh"
 
-#: ../src/client/util/util-date.vala:177
+#: ../src/client/util/util-date.vala:178
 msgid "Yesterday"
 msgstr "Onte"
 
 #. / 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
+#: ../src/client/util/util-date.vala:183
 msgid "%A"
 msgstr "%A"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:729
-msgid "(no subject)"
-msgstr "(sen asunto)"
-
 #: ../src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "bytes"
@@ -1125,550 +1074,696 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KB"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d mensaxe"
+msgstr[1] "%d mensaxes"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Correo de Yahoo!"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d sen ler"
+msgstr[1] "%d sen ler"
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Outro"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Bandexas de entrada"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Bandexa de entrada"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Buscar na conta %s"
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Borradores"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d resultado"
+msgstr[1] "%d resultados"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Correo enviado"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "Non hai ningunha conversa seleccionada."
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Destacados"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] "%u conversa seleccionada."
+msgstr[1] "%u conversas seleccionadas."
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Importante"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
+msgstr "Non se atoparon resultados de busca."
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Todo o correo"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
+msgstr "Non hai conversas no cartafol."
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Correo lixo"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
+msgstr "Esta mensaxe contén imaxes remotas."
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Lixo"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr "Amosar as imaxes"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Bandexa de saída"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
+msgstr "Amosar sempre o remitente"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Arquivo"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
+msgstr "Editar o borrador"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:25
-msgid "None"
-msgstr "Ningún"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "De:"
 
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.
-#: ../src/engine/imap-db/imap-db-account.vala:639
-msgid "attachment"
-msgstr "anexo"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "Para:"
 
-#. / Can be typed in the search box like bcc:johndoe example com to find
-#. / messages bcc'd to a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:642
-msgid "bcc"
-msgstr "cco"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "CC:"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:645
-msgid "body"
-msgstr "corpo"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "CCO:"
 
-#. / Can be typed in the search box like cc:johndoe example com to find
-#. / messages cc'd to a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:648
-msgid "cc"
-msgstr "cc"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "Asunto:"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.
-#: ../src/engine/imap-db/imap-db-account.vala:651
-msgid "from"
-msgstr "desde"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Data:"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:654
-msgid "subject"
-msgstr "asunto"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] "%u mensaxe lida"
+msgstr[1] "%u mensaxes lidas"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:657
-msgid "to"
-msgstr "para"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
+msgstr ""
+"Esta mensaxe foi enviada correctamente, porén non puido gardarse en %s."
 
-#. / 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 de %b do %Y ás %-l:%M %p"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "_Copiar"
 
-#. / 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 "O %1$s, %2$s escribiu:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "Copiar o _enderezo de correo"
 
-#. / 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 escribiu:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "Copiar a _ligazón"
 
-#. / 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 "O %s:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
+msgstr "Seleccione a _mensaxe"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Mensaxe reenviada ----------"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Seleccionar _todo"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "De: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "_Inspeccionar"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Asunto: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr "Semella que esta ligazón é para ir a"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "Data: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
+msgstr "mais realmente vai a"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "Para: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
+msgstr " (Incorrecto?)"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Cc: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
+msgstr "_Gardar a imaxe como..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_Gardar como..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "Gardar todos os ane_xos..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] "Gardar o ane_xo..."
+msgstr[1] "Gardar todos os ane_xos..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "Responder a _todos"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "_Marcar como lido"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "_Marcar como sen ler"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
+msgstr "Marcar como non lido desde _aquí"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "_Ver o código fonte"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "Produciuse un erro ao abrir o editor de textos predeterminado."
+
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr "%s - Inspector de conversas"
+
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Gardado"
+
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Gardando"
+
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Produciuse un erro ao gardar"
+
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Non é posíbel eliminar a conta</span> "
 
-#: ../ui/account_cannot_remove.glade.h:2
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Mensaxe nova"
+
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Confirma que quere desbotar esta mensaxe?"
+
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Enviar a mensaxe sen asunto e sen contido?"
+
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Enviar a mensaxe sen asunto?"
+
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Enviar a mensaxe sen contido?"
+
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Enviar a mensaxe sen anexo?"
+
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Non é posíbel engadir o anexo"
+
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "Non foi posíbel atopar «%s»."
+
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "«%s» é un cartafol."
+
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "«%s» é un ficheiro baleiro."
+
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "Non foi posíbel abrir «%s» para a súa lectura."
+
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "«%s» xa foi anexado para o envío."
+
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
 msgstr ""
-"Xa ten aberta unha xanela de redacción asociada a esta conta. Envíe ou "
-"desbote a mensaxe e ténteo de novo."
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Engadir unha conta"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr ""
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Editar a conta"
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr ""
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Retirar a conta"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr ""
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Agarde mentres Geary confirma a súa conta."
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Escoller unha cor"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Desfacer"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr ""
 
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Refacer"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr ""
 
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "Cor_tar"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr ""
 
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "_Pegar"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Enviando..."
 
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Esquerda"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i aparición"
+msgstr[1] "%i aparicións"
 
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Dereita"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i coincidencia (desde o principio)"
+msgstr[1] "%i coincidencias (desde o principio)"
 
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Centro"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "non atopado"
 
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Xustificar"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_Aceptar"
 
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Ligazón (Ctrl+L)"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "C_or"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Pechar"
 
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Máis opcións"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Desbotar"
 
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Texto delimitado  (Ctrl+])"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Abrir"
 
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Texto sen delimitar (Ctrl+[)"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "Im_primir..."
 
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Retirar o formato (Ctrl+Espazo)"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Retirar"
 
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Pegar _con formato"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Conservar"
 
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Negra (Ctrl+B)"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Buscar en todas as mensaxes da conta por palabras clave (Ctrl+S)"
 
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Itálica (Ctrl+I)"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Indexando %s conta(s)"
 
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Subliñado (Ctrl+U)"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Riscado (Ctrl+K)"
+#~ msgid "Geary Mail"
+#~ msgstr "Correo Geary"
 
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "Texto _mellorado"
+#~ msgid "Send and receive email"
+#~ msgstr "Enviar e recibir correo"
 
-#: ../ui/composer.glade.h:23
-msgid "Lar_ge"
-msgstr "_Grande"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Correo electrónico;Correo-e;Correo;"
 
-#: ../ui/composer.glade.h:24
-msgid "Large"
-msgstr "Grande"
+#~ msgid "Compose Message"
+#~ msgstr "Redactar unha mensaxe"
 
-#: ../ui/composer.glade.h:25
-msgid "_Medium"
-msgstr "_Mediano"
+#~ msgid "Copyright 2011-2014 Yorba Foundation"
+#~ msgstr "Copyright 2011-2014 Yorba Foundation"
 
-#: ../ui/composer.glade.h:26
-msgid "Medium"
-msgstr "Medio"
+#~ msgid "_Delete"
+#~ msgstr "_Eliminar"
 
-#: ../ui/composer.glade.h:27
-msgid "_Small"
-msgstr "_Pequeno"
+#~ msgid "_Trash"
+#~ msgstr "_Lixo"
 
-#: ../ui/composer.glade.h:28
-msgid "Small"
-msgstr "Pequeno"
+#~ msgid "Move conversation to trash (Delete, Backspace)"
+#~ msgstr "Mover conversa ao lixo (Supr, Retroceso)"
 
-#: ../ui/composer.glade.h:29
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
+#~ msgid "Move conversations to trash (Delete, Backspace)"
+#~ msgstr "Mover conversas ao lixo (Supr, Retroceso)"
 
-#: ../ui/composer.glade.h:30
-msgid "Sans Serif"
-msgstr "Sen serifa"
+#~ msgid "_Donate"
+#~ msgstr "_Facer unha doazon"
 
-#: ../ui/composer.glade.h:31
-msgid "S_erif"
-msgstr "S_erif"
+#~ msgid "attach|enclosed|enclosing|cover letter"
+#~ msgstr "anexo|incluído|engadido|carta de presentación"
 
-#: ../ui/composer.glade.h:32
-msgid "Serif"
-msgstr "Serifa"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Quere desbotar a mensaxe sen gardar?"
 
-#: ../ui/composer.glade.h:33
-msgid "_Fixed Width"
-msgstr "Largo _fixo"
+#~ msgid "Please enter your password"
+#~ msgstr "Escriba o seu contrasinal"
 
-#: ../ui/composer.glade.h:34
-msgid "Fixed Width"
-msgstr "Largo fixo"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Non é posíbel eliminar a conta</span> "
 
-#: ../ui/composer.glade.h:42
-msgid "Drop files here"
-msgstr "Arrastre os ficheiros cara aquí"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Xa ten aberta unha xanela de redacción asociada a esta conta. Envíe ou "
+#~ "desbote a mensaxe e ténteo de novo."
 
-#: ../ui/composer.glade.h:43
-msgid "To add them as attachments"
-msgstr "Para engadilos como ficheiros anexos"
+#~ msgid "Add account"
+#~ msgstr "Engadir unha conta"
 
-#: ../ui/composer.glade.h:44
-msgid "_Attach File"
-msgstr "_Anexar un ficheiro"
+#~ msgid "Edit account"
+#~ msgstr "Editar a conta"
 
-#: ../ui/composer.glade.h:45
-msgid "_Include Original Attachments"
-msgstr "_Incluír o(s) anexo(s) do orixinal"
+#~ msgid "Remove account"
+#~ msgstr "Retirar a conta"
 
-#: ../ui/composer.glade.h:47
-msgid "_Send"
-msgstr "_Enviar"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Agarde mentres Geary confirma a súa conta."
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Buscar:"
+#~ msgid "_Undo"
+#~ msgstr "_Desfacer"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Anterior"
+#~ msgid "_Redo"
+#~ msgstr "_Refacer"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Seguinte"
+#~ msgid "Cu_t"
+#~ msgstr "Cor_tar"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Diferenciar maiúsculas de minúsculas"
+#~ msgid "_Paste"
+#~ msgstr "_Pegar"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "etiqueta"
+#~ msgid "_Left"
+#~ msgstr "_Esquerda"
 
-#: ../ui/login.glade.h:1
-msgid "Password"
-msgstr "Contrasinal"
+#~ msgid "_Right"
+#~ msgstr "_Dereita"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address:"
-msgstr "Enderezo de _correo:"
+#~ msgid "_Center"
+#~ msgstr "_Centro"
 
-#: ../ui/login.glade.h:3
-msgid "_Password:"
-msgstr "_Contrasinal:"
+#~ msgid "_Justify"
+#~ msgstr "_Xustificar"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice:"
-msgstr "S_ervizo:"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Ligazón (Ctrl+L)"
 
-#: ../ui/login.glade.h:5
-msgid "N_ame:"
-msgstr "N_ome:"
+#~ msgid "C_olor"
+#~ msgstr "C_or"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname:"
-msgstr "Alc_ume:"
+#~ msgid "More options"
+#~ msgstr "Máis opcións"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Traballo, casa, etc."
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Texto delimitado  (Ctrl+])"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_Gardar correo enviado"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Texto sen delimitar (Ctrl+[)"
 
-#: ../ui/login.glade.h:10
-msgid "IMAP settings"
-msgstr "Configuración de IMAP"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Retirar o formato (Ctrl+Espazo)"
 
-#: ../ui/login.glade.h:11
-msgid "Se_rver:"
-msgstr "Se_rvidor:"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Pegar _con formato"
 
-#: ../ui/login.glade.h:12
-msgid "P_ort:"
-msgstr "P_orto:"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Negra (Ctrl+B)"
 
-#: ../ui/login.glade.h:13
-msgid "Ser_ver:"
-msgstr "Ser_vidor:"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Itálica (Ctrl+I)"
 
-#: ../ui/login.glade.h:14
-msgid "Por_t:"
-msgstr "Por_to:"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Subliñado (Ctrl+U)"
 
-#: ../ui/login.glade.h:15
-msgid "SMTP settings"
-msgstr "Configuración do SMTP"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Riscado (Ctrl+K)"
 
-#: ../ui/login.glade.h:16
-msgid "User_name:"
-msgstr "_Nome de usuario:"
+#~ msgid "_Rich Text"
+#~ msgstr "Texto _mellorado"
 
-#: ../ui/login.glade.h:17
-msgid "Pass_word:"
-msgstr "Con_trasinal:"
+#~ msgid "Lar_ge"
+#~ msgstr "_Grande"
 
-#: ../ui/login.glade.h:18
-msgid "SMTP username"
-msgstr "Nome do usuario SMTP"
+#~ msgid "Large"
+#~ msgstr "Grande"
 
-#: ../ui/login.glade.h:19
-msgid "SMTP password"
-msgstr "Contrasinal do SMTP"
+#~ msgid "_Medium"
+#~ msgstr "_Mediano"
 
-#: ../ui/login.glade.h:20
-msgid "_Username:"
-msgstr "Nome do _usuario:"
+#~ msgid "Medium"
+#~ msgstr "Medio"
 
-#: ../ui/login.glade.h:21
-msgid "IMAP username"
-msgstr "Nome do usuario IMAP"
+#~ msgid "_Small"
+#~ msgstr "_Pequeno"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP password"
-msgstr "Contrasinal do IMAP"
+#~ msgid "Small"
+#~ msgstr "Pequeno"
 
-#: ../ui/login.glade.h:23
-msgid "Encr_yption:"
-msgstr "Ci_frado:"
+#~ msgid "S_ans Serif"
+#~ msgstr "S_ans Serif"
 
-#: ../ui/login.glade.h:24
-msgid "Encrypt_ion:"
-msgstr "C_ifrado:"
+#~ msgid "Sans Serif"
+#~ msgstr "Sen serifa"
 
-#: ../ui/login.glade.h:26
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "S_erif"
+#~ msgstr "S_erif"
 
-#: ../ui/login.glade.h:27
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "Serif"
+#~ msgstr "Serifa"
 
-#: ../ui/login.glade.h:28
-msgid "No authentication re_quired"
-msgstr "Non se re_quire autenticación"
+#~ msgid "_Fixed Width"
+#~ msgstr "Largo _fixo"
 
-#: ../ui/login.glade.h:29
-msgid "Storage"
-msgstr "Almacenamento"
+#~ msgid "Fixed Width"
+#~ msgstr "Largo fixo"
 
-#: ../ui/login.glade.h:30
-msgid "_Download mail:"
-msgstr "_Descargar o correo:"
+#~ msgid "Drop files here"
+#~ msgstr "Arrastre os ficheiros cara aquí"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "Credenciais SMTP"
+#~ msgid "To add them as attachments"
+#~ msgstr "Para engadilos como ficheiros anexos"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username:"
-msgstr "Nome de usuario:"
+#~ msgid "_Attach File"
+#~ msgstr "_Anexar un ficheiro"
 
-#: ../ui/password-dialog.glade.h:3
-msgid "Password:"
-msgstr "Contrasinal:"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Incluír o(s) anexo(s) do orixinal"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Lembrar contrasinal"
+#~ msgid "_Send"
+#~ msgstr "_Enviar"
 
-#: ../ui/preferences.glade.h:2
-msgid "Reading"
-msgstr "Lendo"
+#~ msgid "Find:"
+#~ msgstr "Buscar:"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Automatically select next message"
-msgstr "Seleccionar _automaticamente a seguinte mensaxe"
+#~ msgid "_Previous"
+#~ msgstr "_Anterior"
 
-#: ../ui/preferences.glade.h:4
-msgid "_Display conversation preview"
-msgstr "_Amosar a vista previa da conversa"
+#~ msgid "_Next"
+#~ msgstr "_Seguinte"
 
-#: ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Redactor"
+#~ msgid "_Case sensitive"
+#~ msgstr "_Diferenciar maiúsculas de minúsculas"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "Activar comprobación _ortográfica"
+#~ msgid "label"
+#~ msgstr "etiqueta"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "Notificacións"
+#~ msgid "Password"
+#~ msgstr "Contrasinal"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "_Usar sons de notificación"
+#~ msgid "E_mail address:"
+#~ msgstr "Enderezo de _correo:"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "Amosar _notificacións cando chegue correo novo"
+#~ msgid "_Password:"
+#~ msgstr "_Contrasinal:"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Confirma que quere retirar esta conta?"
-"</span> "
+#~ msgid "S_ervice:"
+#~ msgstr "S_ervizo:"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Todo o correo asociado a esta conta vai ser retirado do seu computador. Isto "
-"non afectará ao correo no servidor."
+#~ msgid "N_ame:"
+#~ msgstr "N_ome:"
+
+#~ msgid "N_ickname:"
+#~ msgstr "Alc_ume:"
+
+#~ msgid "Work, Home, etc."
+#~ msgstr "Traballo, casa, etc."
+
+#~ msgid "_Save sent mail"
+#~ msgstr "_Gardar correo enviado"
+
+#~ msgid "IMAP settings"
+#~ msgstr "Configuración de IMAP"
+
+#~ msgid "Se_rver:"
+#~ msgstr "Se_rvidor:"
+
+#~ msgid "P_ort:"
+#~ msgstr "P_orto:"
+
+#~ msgid "Ser_ver:"
+#~ msgstr "Ser_vidor:"
+
+#~ msgid "Por_t:"
+#~ msgstr "Por_to:"
+
+#~ msgid "SMTP settings"
+#~ msgstr "Configuración do SMTP"
+
+#~ msgid "User_name:"
+#~ msgstr "_Nome de usuario:"
+
+#~ msgid "Pass_word:"
+#~ msgstr "Con_trasinal:"
+
+#~ msgid "SMTP username"
+#~ msgstr "Nome do usuario SMTP"
+
+#~ msgid "SMTP password"
+#~ msgstr "Contrasinal do SMTP"
+
+#~ msgid "_Username:"
+#~ msgstr "Nome do _usuario:"
+
+#~ msgid "IMAP username"
+#~ msgstr "Nome do usuario IMAP"
+
+#~ msgid "IMAP password"
+#~ msgstr "Contrasinal do IMAP"
+
+#~ msgid "Encr_yption:"
+#~ msgstr "Ci_frado:"
+
+#~ msgid "Encrypt_ion:"
+#~ msgstr "C_ifrado:"
+
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
+
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
+
+#~ msgid "No authentication re_quired"
+#~ msgstr "Non se re_quire autenticación"
+
+#~ msgid "Storage"
+#~ msgstr "Almacenamento"
+
+#~ msgid "_Download mail:"
+#~ msgstr "_Descargar o correo:"
+
+#~ msgid "SMTP Credentials"
+#~ msgstr "Credenciais SMTP"
+
+#~ msgid "Username:"
+#~ msgstr "Nome de usuario:"
+
+#~ msgid "Password:"
+#~ msgstr "Contrasinal:"
+
+#~ msgid "_Remember password"
+#~ msgstr "_Lembrar contrasinal"
+
+#~ msgid "Reading"
+#~ msgstr "Lendo"
+
+#~ msgid "_Automatically select next message"
+#~ msgstr "Seleccionar _automaticamente a seguinte mensaxe"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Amosar a vista previa da conversa"
+
+#~ msgid "Composer"
+#~ msgstr "Redactor"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Activar comprobación _ortográfica"
+
+#~ msgid "Notifications"
+#~ msgstr "Notificacións"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Usar sons de notificación"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Amosar _notificacións cando chegue correo novo"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Confirma que quere retirar esta "
+#~ "conta?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Todo o correo asociado a esta conta vai ser retirado do seu computador. Isto "
+#~ "non afectará ao correo no servidor."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Alcume:"
+#~ msgid "Nickname:"
+#~ msgstr "Alcume:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Enderezo de correo:"
+#~ msgid "Email address:"
+#~ msgstr "Enderezo de correo:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary upgrade in progress."
-msgstr "Actualización de Geary en progreso."
+#~ msgid "Geary upgrade in progress."
+#~ msgstr "Actualización de Geary en progreso."
 
 #~ msgid "Archive conversation (Delete, Backspace, A)"
 #~ msgstr "Arquivar a conversa (Supr, Retroceso, A)"
@@ -1698,7 +1793,7 @@ msgstr "Actualización de Geary en progreso."
 #~ msgstr "Servizo:"
 
 #~ msgid "Unable to login to email server"
-#~ msgstr "Non foi posíbel identificarse diante do servidor de correo: "
+#~ msgstr "Non foi posíbel identificarse diante do servidor de correo:"
 
 #~ msgid "_Details"
 #~ msgstr "_Detalles"
diff --git a/po/he.po b/po/he.po
index 00fb2bf..9606171 100644
--- a/po/he.po
+++ b/po/he.po
@@ -16,452 +16,426 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-19 13:19+0300\n"
-"PO-Revision-Date: 2015-07-19 13:19+0300\n"
-"Last-Translator: Yosef Or Boczko <yoseforb gmail com>\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:04+0000\n"
+"Last-Translator: Yosef Or Boczko <Unknown>\n"
 "Language-Team: עברית <>\n"
-"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n>2||n==0) ? 1 : 2;\n"
-"X-Generator: Gtranslator 2.91.6\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "לקוח דוא״ל"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "דואר אלקטרוני Geary"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "שליחה וקבלה של דוא״ל"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "דוא״ל;דואר אלקטרוני;דואר;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "יצירת הודעה"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "שליחה על ידי דוא״ל"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "שליחת קבצים באמצעות Geary"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_שמירה"
+"X-Launchpad-Export-Date: 2015-11-23 05:54+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: he\n"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_הוספה"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "טיוטות | טיוטה | Drafts | Draft"
 
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "כתובות נוספות עבור %s"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr "דואר יוצא | דואר נשלח | Sent | Sent Mail | Sent Email | Sent E-Mail"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "משתמשים"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+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"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "שם פרטי שם משפחה"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "אשפה | זבל | Trash | Rubbish | Rubbish Bin"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Welcome to Geary."
-msgstr "ברוך בואך ל־Geary."
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr "ארכיון | ארכיב | ארכיונים | ארכיבים | Archive | Archives"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Enter your account information to get started."
-msgstr "נא להזין את פרטי החשבון שלך כדי להתחיל."
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "דואר נכנס"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "2 weeks back"
-msgstr "שבועיים אחורנית"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "טיוטות"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "1 month back"
-msgstr "חודש אחד אחורנית"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "דואר יוצא"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "3 months back"
-msgstr "שלושה חודשים אחורנית"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "מסומן בכוכב"
 
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "6 months back"
-msgstr "שישה חודשים אחורנית"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "חשוב"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "1 year back"
-msgstr "שנה אחת אחורנית"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "כל ההודעות"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-msgid "2 years back"
-msgstr "שנתיים אחורנית"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "דואר זבל"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-msgid "4 years back"
-msgstr "ארבע שנים אחורנית"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "אשפה"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "Everything"
-msgstr "הכל"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "בהמתנה לשליחה"
 
-#: ../src/client/accounts/add-edit-page.vala:280
-msgid "Edit"
-msgstr "עריכה"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "חיפוש"
 
-#: ../src/client/accounts/add-edit-page.vala:282
-msgid "Preview"
-msgstr "תצוגה מקדימה"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "ארכיון"
 
-#: ../src/client/accounts/add-edit-page.vala:723
-msgid "Remem_ber passwords"
-msgstr "זכירת סס_מאות"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "כלום"
 
-#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "זכירת _ססמה"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:764
-msgid "Unable to validate:\n"
-msgstr "לא ניתן לאמת לאמת:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:766
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; כינוי חשבון לא חוקי.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:769
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; כתובת דוא״ל זה כבר נוסף ל־Geary.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "דוא״ל Yahoo"
 
-#: ../src/client/accounts/add-edit-page.vala:773
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP בעיית חיבור.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:776
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "&#8226; שם משתמש או ססמת ה־IMAP שגויים.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "אחר"
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP בעיית חיבור.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "מצורף"
 
-#: ../src/client/accounts/add-edit-page.vala:782
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; שם משתמש או ססמת SMTP אינם נכונים.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "מוסתר"
 
-#: ../src/client/accounts/add-edit-page.vala:786
-msgid "        &#8226; Connection error.\n"
-msgstr "&#8226; בעיית חיבור.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "גוף"
 
-#: ../src/client/accounts/add-edit-page.vala:790
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; שם משתמש או ססמה אינם נכונים.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "עותק"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "כל הזכויות שמורות 2011–2015 Yorba Foundation"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "מאת"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "ביקור באתר Yorba"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "נושא"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Start Geary with hidden main window"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "אל"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "הצגת מידע שיסייע באיתור תקלות"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "אני"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "ביצוע רישום של מעקב תכתובות"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(ללא נושא)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "ביצוע רישום של network deserialization"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %b %-e, %Y בשעה %-l:%M %p"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "ביצוע רישום של פעילות הרשת"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "בתאריך %1$s, %2$s כתב:"
 
-#. / 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 "ביצוע רישום של replay queue ב־IMAP"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "נכתב על ידי %s:"
 
-#. / 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 "ביצוע רישום של network serialization"
+#. / 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:234
+msgid "On %s:"
+msgstr "בתאריך %s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "ביצוע רישום של פעילות תקופתית"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- הודעה שהועברה ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "ביצוע רישום שאילתות למסד הנתונים (מייצר כמות רבה של הודעות)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "מאת: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "ביצוע רישום של folder normalization"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "נושא: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "לאפשר בדיקה של WebView"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "תאריך: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "לשלול כל אישורי שרת עם אזהרות TLS"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "אל: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "הצגת גרסת התכנה"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "עותק: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "יש להשתמש %s לפתיחת חלון יצירת הודעה חדשה חדש"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "ללא שם"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "נא לשלוח הערות, הצעות ודיווחי תקלות לכתובת:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "לקוח דוא״ל"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "ניתוח הפרמטרים שהועברו בשורת הפקודה נכשל: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "כל הזכויות שמורות 2011–2015 Yorba Foundation"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "הפרמטרים לשורת הפקודה אינם מוכרים: „%s”\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "ביקור באתר Yorba"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:61
 msgid "Delete conversation"
 msgstr "מחיקת שיחה"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "מחיקת שיחה (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "מחיקת שיחות (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:67
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "הזזת שיחה לאשפה (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:68
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "הזזת שיחות לאשפה (Delete, Backspace)"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "תיוק ב_ארכיון"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "תיוק שיחה בארכיון (ש)"
 
-#: ../src/client/application/geary-controller.vala:75
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "תיוק שיחות בארכיון (A)"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "סימון כ_דואר זבל"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "סימון כלא דואר ז_בל"
 
-#: ../src/client/application/geary-controller.vala:81
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "סימון שיחה"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "סימון שיחות"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "הוספת תווית לשיחה"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "הוספת תווית לשיחות"
 
-#: ../src/client/application/geary-controller.vala:85
-#: ../src/client/application/geary-controller.vala:436
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "הזזת שיחה"
 
-#: ../src/client/application/geary-controller.vala:86
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "הזזת שיחות"
 
-#: ../src/client/application/geary-controller.vala:373
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "_חשבונות"
 
-#: ../src/client/application/geary-controller.vala:378
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "הע_דפות"
 
-#: ../src/client/application/geary-controller.vala:382
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_עזרה"
 
-#: ../src/client/application/geary-controller.vala:386
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "על _אודות"
 
-#: ../src/client/application/geary-controller.vala:390
-msgid "_Donate"
-msgstr "_תרומה"
-
-#: ../src/client/application/geary-controller.vala:394
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "י_ציאה"
 
-#: ../src/client/application/geary-controller.vala:399
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_סימון בתור…"
 
-#: ../src/client/application/geary-controller.vala:405
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "סימון כ_נקרא"
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "סימון כ_לא נקרא"
 
-#: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "הוספת _כוכב"
 
-#: ../src/client/application/geary-controller.vala:422
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "ה_סרת כוכב"
 
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "הוספת תווית"
 
-#: ../src/client/application/geary-controller.vala:433
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_תווית"
 
-#: ../src/client/application/geary-controller.vala:437
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "ה_עברה"
 
-#: ../src/client/application/geary-controller.vala:441
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "יצירת הודעה חדשה (Ctrl+מ, מ)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:445
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "לה_שיב"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "להשיב (Ctrl+ר, ר)"
 
-#: ../src/client/application/geary-controller.vala:450
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "להשיב ל_כולם"
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "להשיב לכולם (Ctrl+Shift+ר, Shift+ר)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "ה_עברה"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "העברה (Ctrl+ך, כ)"
 
-#: ../src/client/application/geary-controller.vala:496
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr "ריקון"
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr "ריקון תיקיית דואר זבל או אשפה"
 
-#: ../src/client/application/geary-controller.vala:501
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr "ריקון דואר _זבל…"
 
-#: ../src/client/application/geary-controller.vala:505
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr "ריקון א_שפה…"
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:538
+#: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
 msgstr "הצגת סרגל החיפוש"
 
-#: ../src/client/application/geary-controller.vala:752
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "לא ניתן לאחסן שרת מהימן חריג"
 
-#: ../src/client/application/geary-controller.vala:989
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "ההגדרות שלך אינן בטוחות"
 
-#: ../src/client/application/geary-controller.vala:990
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -471,17 +445,17 @@ msgstr ""
 "או TLS. משמעות הדבר ששם המשתמש והססמה שלך יכולים להיקרא ע״י תכניות מעקב ברשת "
 "שלך. האם להתחבר לחשבון?"
 
-#: ../src/client/application/geary-controller.vala:991
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "לה_משיך"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "שגיאה בשליחת דוא״ל"
 
-#: ../src/client/application/geary-controller.vala:1070
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -489,14 +463,12 @@ msgstr ""
 "‏Geary נתקל בשגיאה בשליחת דוא״ל. אם הבעיה נמשכת, יש למחוק ידנית את הדוא״ל "
 "מתיקיית דואר יוצא שלך."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "שגיאה בשמירת דוא״ל שנשלח"
 
-#: ../src/client/application/geary-controller.vala:1075
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -504,20 +476,15 @@ msgstr ""
 "‏Geary נתקל בשגיאה בשמירת הודעה שנשלחה לדואר יוצא. ההודעה תישאר בתיקייה "
 "בהמתנה לשליחה עד שתמחק."
 
-#: ../src/client/application/geary-controller.vala:1144
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "תוויות"
 
-#. 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:1156
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "לא ניתן לפתוח מסד הנתונים עבור %s"
 
-#: ../src/client/application/geary-controller.vala:1157
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -539,21 +506,19 @@ msgstr ""
 "יצירה מחדש של מסד הנתונים תמחק את כל הדוא״ל המקומי ואת כל הקבצים המצורפים "
 "שלו. <b> הדואר על השרת שלך לא יושפע.</b>"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "י_צירה מחדש"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "י_ציאה"
 
-#: ../src/client/application/geary-controller.vala:1168
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "לא ניתן ליצור מחדש מסד נתונים עבור „%s”"
 
-#: ../src/client/application/geary-controller.vala:1169
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -562,17 +527,13 @@ msgstr ""
 "שגיאה במהלך יצירה מחדש:\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1191
-#: ../src/client/application/geary-controller.vala:1201
-#: ../src/client/application/geary-controller.vala:1212
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "לא ניתן לפתוח תיבת דואר מקומית עבור %s"
 
-#: ../src/client/application/geary-controller.vala:1192
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -588,7 +549,7 @@ msgstr ""
 "יש לבדוק אם יש לך הרשאות קריאה/כתיבה לכל הקבצים בתיקייה:\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1202
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -601,7 +562,7 @@ msgstr ""
 "\n"
 "יש להתקין שוב את הגרסה  האחרונה של Geary."
 
-#: ../src/client/application/geary-controller.vala:1213
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -612,30 +573,31 @@ msgstr ""
 "\n"
 "יש לבדוק את חיבור הרשת שלך ולהפעיל מחדש את Geary."
 
-#: ../src/client/application/geary-controller.vala:1721
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "על אודות %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1724
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
 msgstr ""
 "דוביקס <dovix2003 gmail com>\n"
 "ירון שהרבני <sh yaron gmail com>\n"
-"יוסף אור בוצ׳קו <yoseforb gnome org>"
+"יוסף אור בוצ׳קו <yoseforb gnome org>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Yosef Or Boczko https://launchpad.net/~yoseforb";
 
-#: ../src/client/application/geary-controller.vala:1990
+#: ../src/client/application/geary-controller.vala:1976
 msgid "Undo move (Ctrl+Z)"
 msgstr "ביטול העברה (Ctrl+ז)"
 
-#: ../src/client/application/geary-controller.vala:2000
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "האם אכן לפתוח את „%s”?"
 
-#: ../src/client/application/geary-controller.vala:2001
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -643,301 +605,524 @@ msgstr ""
 "קבצים מצורפים עלולים לגרום נזק למערכת שלך. כדאי לפתוח אך ורק קבצים המגיעים "
 "ממקור אמין."
 
-#: ../src/client/application/geary-controller.vala:2002
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "_לא לשאול אותי שוב"
 
-#: ../src/client/application/geary-controller.vala:2020
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "קובץ בשם „%s” כבר קיים. האם להחליף אותו?"
 
-#: ../src/client/application/geary-controller.vala:2022
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "הקובץ כבר קיים תחת „%s”. החלפתו תגרום לאיבוד התוכן הקיים."
 
-#: ../src/client/application/geary-controller.vala:2025
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "ה_חלפה"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2323
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "סגירת טיוטות פתוחות?"
 
-#: ../src/client/application/geary-controller.vala:2453
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr "ריקון כל הדואר מהתיקייה %s?"
 
-#: ../src/client/application/geary-controller.vala:2454
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr "פעולה זו מוחקת את הדואר מ־Geary וכן משרת הדוא״ל שלך."
 
-#: ../src/client/application/geary-controller.vala:2455
+#: ../src/client/application/geary-controller.vala:2441
 msgid "This cannot be undone."
 msgstr "פעולה זה לא ניתנת לביטול."
 
-#: ../src/client/application/geary-controller.vala:2456
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr "ריקון %s"
 
-#: ../src/client/application/geary-controller.vala:2473
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 msgid "Error emptying %s"
 msgstr "שגיאה בריקון %s"
 
-#: ../src/client/application/geary-controller.vala:2503
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "האם ברצונך למחוק הודעה זו לצמיתות?"
 msgstr[1] "האם ברצונך למחוק הודעות אלה לצמיתות?"
-msgstr[2] "האם ברצונך למחוק הודעות אלה לצמיתות?"
 
-#: ../src/client/application/geary-controller.vala:2505
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "מחיקה"
 
-#: ../src/client/application/geary-controller.vala:2536
+#: ../src/client/application/geary-controller.vala:2522
 msgid "Undo archive (Ctrl+Z)"
 msgstr "ביטול ארכוב (Ctrl+ז)"
 
-#: ../src/client/application/geary-controller.vala:2551
+#: ../src/client/application/geary-controller.vala:2537
 msgid "Undo trash (Ctrl+Z)"
 msgstr "ביטול העברה לאשפה (Ctrl+ז)"
 
-#: ../src/client/application/geary-controller.vala:2604
+#: ../src/client/application/geary-controller.vala:2590
 msgid "Undo (Ctrl+Z)"
 msgstr "ביטול (Ctrl+ז)"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "התאמה אחת"
-msgstr[1] "%i התאמות"
-msgstr[2] "שתי התאמות"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Start Geary with hidden main window"
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "התאמה אחת (גולש)"
-msgstr[1] "%i התאמות (גולש)"
-msgstr[2] "שתי התאמות (גולש)"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "הצגת מידע שיסייע באיתור תקלות"
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "לא נמצא"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "ביצוע רישום של מעקב תכתובות"
 
-#: ../src/client/components/main-window.vala:430
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "ביצוע רישום של network deserialization"
 
-#: ../src/client/components/search-bar.vala:10
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "חיפוש"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "ביצוע רישום של פעילות הרשת"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:25
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "חיפוש בכל חשבונות הדואר עם צירוף מקשים (Ctrl+ד)"
+#. / 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 "ביצוע רישום של replay queue ב־IMAP"
 
-#: ../src/client/components/search-bar.vala:118
-#, c-format
-msgid "Indexing %s account"
-msgstr "מפתוּח חשבון %s"
+#. / 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 "ביצוע רישום של network serialization"
 
-#: ../src/client/components/search-bar.vala:129
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "חיפוש בחשבון %s"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "ביצוע רישום של פעילות תקופתית"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "שולח…"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "ביצוע רישום שאילתות למסד הנתונים (מייצר כמות רבה של הודעות)"
 
-#: ../src/client/components/stock.vala:18 ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_אישור"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "ביצוע רישום של folder normalization"
 
-#: ../src/client/components/stock.vala:19 ../ui/edit_alternate_emails.glade.h:3
-#: ../ui/password-dialog.glade.h:5 ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_ביטול"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "לאפשר בדיקה של WebView"
 
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_סגירה"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "לשלול כל אישורי שרת עם אזהרות TLS"
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "השל_כה"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "הצגת גרסת התכנה"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_פתיחה"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "יש להשתמש %s לפתיחת חלון יצירת הודעה חדשה חדש"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "ה_דפסה…"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "נא לשלוח הערות, הצעות ודיווחי תקלות לכתובת:"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_הסרה"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "ניתוח הפרמטרים שהועברו בשורת הפקודה נכשל: %s\n"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "בחירת ה_כול"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "הפרמטרים לשורת הפקודה אינם מוכרים: „%s”\n"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_שמירה"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "‏%s - הודעות חדשות"
 
-#: ../src/client/composer/composer-widget.vala:73
-msgid "Saved"
-msgstr "נשמר"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "הודעה חדשה אחת"
+msgstr[1] "%d הודעות חדשות"
 
-#: ../src/client/composer/composer-widget.vala:74
-msgid "Saving"
-msgstr "נשמר"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d הודעה חדשה סך הכל"
+msgstr[1] "%s, %d הודעות חדשות סך הכל"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "Error saving"
-msgstr "שגיאת בשמירה"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d הודעה חדשה אחת עבור %s)"
+msgstr[1] ""
+"%s\n"
+"(%d הודעות חדשות עבור %s)"
 
-#: ../src/client/composer/composer-widget.vala:76
-msgid "Press Backspace to delete quote"
-msgstr "יש להקיש על Backspace למחיקת ציטוט"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "פתיחה"
 
-#: ../src/client/composer/composer-widget.vala:77
-msgid "New Message"
-msgstr "הודעה חדשה"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "אני"
 
-#. A 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:138
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr "התחברות לא מהימנה: %s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr "המזהה של שרת הדואר %s ב־%s: ‏%u לא ניתן לאימות."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
 msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
-msgstr "לצרף|צירוף|מצורף|צרף|קובץ מצורף|צורף|נספח"
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr ""
+"בחירת „לבטוח בשרת זה” או „תמיד לבטוח בשרת זה” תגרום לשם המשתמש ולססמה שלך "
+"לעבור באופן לא בטוח."
 
-#: ../src/client/composer/composer-widget.vala:1102
-#: ../src/client/composer/composer-widget.vala:1106
-msgid "Do you want to discard this message?"
-msgstr "האם למחוק הודעה זו?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr "בחירת „לא לבטוח בשרת זה” תגרום ל־Geart לא לגשת לשרת זה."
 
-#: ../src/client/composer/composer-widget.vala:1262
-msgid "Send message with an empty subject and body?"
-msgstr "האם לשלוח את ההודעה ללא כותרת ותוכן?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "‏Geary לא יוסיף או יעדכן חשבון דוא״ל זה."
 
-#: ../src/client/composer/composer-widget.vala:1264
-msgid "Send message with an empty subject?"
-msgstr "האם לשלוח את ההודעה ללא כותרת?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr "בחירת „לא לבטוח בשרת זה” יגרום ל־Geart להפסיק לגשת לחשבון זה."
 
-#: ../src/client/composer/composer-widget.vala:1266
-msgid "Send message with an empty body?"
-msgstr "האם לשלוח את ההודעה ללא תוכן?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr "‏Geary יצא אם אין לך עוד חשבונות דוא״ל פתוחים."
 
-#: ../src/client/composer/composer-widget.vala:1268
-msgid "Send message without an attachment?"
-msgstr "האם לשלוח את ההודעה ללא קובץ מצורף?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"יש ליצור קשר עם מנהל המערכת או עם ספק שירות הדוא״ל שלך אם ברצונך לשאול על "
+"נושאים אלה."
 
-#: ../src/client/composer/composer-widget.vala:1530
-msgid "Cannot add attachment"
-msgstr "לא ניתן לצרף את הקובץ המבוקש"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr "תעודת השרת אינה חתומה על ידי מנפיק מהימן"
 
-#: ../src/client/composer/composer-widget.vala:1541
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "‏„%s” לא נמצא."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr "מזהה השרת לא תואם את מזהה התעודה"
 
-#: ../src/client/composer/composer-widget.vala:1548
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "‏„%s” היא תיקייה."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "פגה תקפה של תעודת השרת"
 
-#: ../src/client/composer/composer-widget.vala:1555
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "‏„%s” הוא קובץ ריק."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "תעודת השרת לא הופעלה"
 
-#: ../src/client/composer/composer-widget.vala:1569
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "לא ניתן לפתוח את „%s” לקריאה."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "תעודת השרת בוטלה ואינה תקפה כעת"
 
-#: ../src/client/composer/composer-widget.vala:1576
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "‏„%s” כבר מצורף למכתב."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "תעודת השרת אינה בטוחה"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1585
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr "התרחשה שגיאה בעיבוד תעודת השרת"
 
-#: ../src/client/composer/composer-widget.vala:1645
-msgid "To: "
-msgstr "אל: "
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr "‏Geary דורש את ססמת הדוא״ל שלך כדי להמשיך"
 
-#: ../src/client/composer/composer-widget.vala:1648
-msgid "Cc: "
-msgstr "עותק: "
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "בחירת קובץ"
 
-#: ../src/client/composer/composer-widget.vala:1651
-msgid "Bcc: "
-msgstr "עותק מוסתר: "
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_צירוף"
 
-#: ../src/client/composer/composer-widget.vala:1654
-msgid "Reply-To: "
-msgstr "להשבי אל:"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr "כתובות נוספות עבור %s"
 
-#: ../src/client/composer/composer-widget.vala:1887
-msgid "Select Color"
-msgstr "בחר צבע"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "משתמשים"
 
-#. 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:2322
-#, c-format
-msgid "%1$s via %2$s"
-msgstr "%1$s באמצעות %2$s"
+#. / 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 "שם פרטי שם משפחה"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2364
-msgid "_From:"
-msgstr "_מאת:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "ברוך בואך ל־Geary."
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "אני"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "נא להזין את פרטי החשבון שלך כדי להתחיל."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "שבועיים אחורנית"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "חודש אחד אחורנית"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "שלושה חודשים אחורנית"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "שישה חודשים אחורנית"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "שנה אחת אחורנית"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "שנתיים אחורנית"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "ארבע שנים אחורנית"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "הכל"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "עריכה"
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr "תצוגה מקדימה"
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "זכירת סס_מאות"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "זכירת _ססמה"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "לא ניתן לאמת לאמת:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; כינוי חשבון לא חוקי.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; כתובת דוא״ל זה כבר נוסף ל־Geary.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; IMAP בעיית חיבור.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; שם משתמש או ססמת ה־IMAP שגויים.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; SMTP בעיית חיבור.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; שם משתמש או ססמת SMTP אינם נכונים.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; בעיית חיבור.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; שם משתמש או ססמה אינם נכונים.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_שמירה"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_הוספה"
+
+#. / 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 "%l:%M %P"
+
+#. / 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 "עכשיו"
+
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "לפני דקה"
+msgstr[1] "לפני %d דקות"
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "לפני שעה"
+msgstr[1] "לפני %d שעות"
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "אתמול"
+
+#. / 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
+msgid "%A"
+msgstr "‏%A"
+
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "בתים"
+
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "ט״ב"
+
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "ג״ב"
+
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "מ״ב"
+
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "ק״ב"
+
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "הודעה אחת"
+msgstr[1] "%d הודעות"
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "אחת לא נקראה"
+msgstr[1] "%d לא נקראו"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "תיבות דואר נכנס"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "חיפוש בחשבון %s"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d תוצאות"
+msgstr[1] "%d תוצאות"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "לא נבחרה אף תכתובת."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "נבחרה תכתובת אחת."
 msgstr[1] "נבחרו %u תכתובות."
-msgstr[2] "נבחרו שתי תכתובות."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:444
 msgid "No search results found."
@@ -988,41 +1173,36 @@ msgid "Date:"
 msgstr "תאריך:"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "הודעה אחת שנקראה"
 msgstr[1] "%u הודעות שנקראו"
-msgstr[2] "שתי הודעות שנקראו"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr "ההודעה נשלחה בהצלחה, אך לא ניתן לשמור אותה אל  %s."
 
-#. Add a menu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "ה_עתקה"
 
-#. Add a menu item for copying the address.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "העתקת כתובת _דוא״ל"
 
-#. Add a menu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "ה_עתקת קישור"
 
-#. Select message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "_בחירת הודעה"
 
-#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "בחירת ה_כול"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "_בחינה"
@@ -1035,7 +1215,6 @@ msgstr "הקישור מראה לאן ללכת"
 msgid "but actually goes to"
 msgstr "אך למעשה הולך ל־"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
 msgstr " (לא חוקי?)"
@@ -1057,14 +1236,11 @@ msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] "שמירת ה_קובץ המצורף…"
 msgstr[1] "שמירת הק_בצים המצורפים…"
-msgstr[2] "שמירת הק_בצים המצורפים…"
 
-#. Reply to all on a message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "להשיב ל_כולם"
 
-#. Mark as read/unread.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "סימון כ_נקרא"
@@ -1077,1068 +1253,614 @@ msgstr "סימון כ_לא נקרא"
 msgid "Mark Unread From _Here"
 msgstr "סימון כלא נקרא מ_כאן"
 
-#. Separator.
-#. View original message source.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "צפייה ב_מקור"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:378
-msgid "none"
-msgstr "ללא שם"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "פתיחת עורך הטקסט נכשלה."
 
 #: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
 msgid "%s - Conversation Inspector"
 msgstr "‏%s - מפקח תכתובת"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "בחירת קובץ"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "נשמר"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_צירוף"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "נשמר"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
-msgid "Untrusted Connection: %s"
-msgstr "התחברות לא מהימנה: %s"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "שגיאת בשמירה"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
-msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr "המזהה של שרת הדואר %s ב־%s: ‏%u לא ניתן לאימות."
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "יש להקיש על Backspace למחיקת ציטוט"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
-msgid ""
-"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-"your username and password to be transmitted insecurely."
-msgstr ""
-"בחירת „לבטוח בשרת זה” או „תמיד לבטוח בשרת זה” תגרום לשם המשתמש ולססמה שלך "
-"לעבור באופן לא בטוח."
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "הודעה חדשה"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-"server."
-msgstr "בחירת „לא לבטוח בשרת זה” תגרום ל־Geart לא לגשת לשרת זה."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
+msgstr "לצרף|צירוף|מצורף|צרף|קובץ מצורף|צורף|נספח"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
-msgid "Geary will not add or update this email account."
-msgstr "‏Geary לא יוסיף או יעדכן חשבון דוא״ל זה."
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "האם למחוק הודעה זו?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-"this account."
-msgstr "בחירת „לא לבטוח בשרת זה” יגרום ל־Geart להפסיק לגשת לחשבון זה."
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "האם לשלוח את ההודעה ללא כותרת ותוכן?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr "‏Geary יצא אם אין לך עוד חשבונות דוא״ל פתוחים."
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "האם לשלוח את ההודעה ללא כותרת?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
-msgid ""
-"Contact your system administrator or email service provider if you have any "
-"question about these issues."
-msgstr ""
-"יש ליצור קשר עם מנהל המערכת או עם ספק שירות הדוא״ל שלך אם ברצונך לשאול על "
-"נושאים אלה."
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "האם לשלוח את ההודעה ללא תוכן?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
-msgstr "תעודת השרת אינה חתומה על ידי מנפיק מהימן"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "האם לשלוח את ההודעה ללא קובץ מצורף?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
-msgid "The server's identity does not match the identity in the certificate"
-msgstr "מזהה השרת לא תואם את מזהה התעודה"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "לא ניתן לצרף את הקובץ המבוקש"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
-msgid "The server's certificate has expired"
-msgstr "פגה תקפה של תעודת השרת"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "‏„%s” לא נמצא."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
-msgid "The server's certificate has not been activated"
-msgstr "תעודת השרת לא הופעלה"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "‏„%s” היא תיקייה."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
-msgid "The server's certificate has been revoked and is now invalid"
-msgstr "תעודת השרת בוטלה ואינה תקפה כעת"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "‏„%s” הוא קובץ ריק."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
-msgid "The server's certificate is considered insecure"
-msgstr "תעודת השרת אינה בטוחה"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "לא ניתן לפתוח את „%s” לקריאה."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
-msgid "An error has occurred processing the server's certificate"
-msgstr "התרחשה שגיאה בעיבוד תעודת השרת"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "‏„%s” כבר מצורף למכתב."
 
-#. 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 "Geary requires your email password to continue"
-msgstr "‏Geary דורש את ססמת הדוא״ל שלך כדי להמשיך"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. 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] "הודעה אחת"
-msgstr[1] "%d הודעות"
-msgstr[2] "שתי הודעות"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "אל: "
 
-#. / 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] "אחת לא נקראה"
-msgstr[1] "%d לא נקראו"
-msgstr[2] "%d לא נקראו"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "עותק: "
 
-#. / 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/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "עותק מוסתר: "
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "תיבות דואר נכנס"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "להשבי אל: "
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d תוצאות"
-msgstr[1] "%d תוצאות"
-msgstr[2] "%d תוצאות"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "בחר צבע"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "‏%s - הודעות חדשות"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr "%1$s באמצעות %2$s"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "הודעה חדשה אחת"
-msgstr[1] "%d הודעות חדשות"
-msgstr[2] "שתי הודעות חדשות"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_מאת:"
 
-#: ../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 הודעה חדשה סך הכל"
-msgstr[1] "%s, %d הודעות חדשות סך הכל"
-msgstr[2] "%s, %d הודעות חדשות סך הכל"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 הודעה חדשה אחת עבור %s)"
-msgstr[1] ""
-"%s\n"
-"(%d הודעות חדשות עבור %s)"
-msgstr[2] ""
-"%s\n"
-"(%d הודעות חדשות עבור %s)"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "שולח…"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "פתיחה"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "התאמה אחת"
+msgstr[1] "%i התאמות"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "התאמה אחת (גולש)"
+msgstr[1] "%i התאמות (גולש)"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "לא נמצא"
 
-#. / 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"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_אישור"
 
-#. / 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"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_ביטול"
 
-#. / 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"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_סגירה"
 
-#. / 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"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "השל_כה"
 
-#. / 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"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_פתיחה"
 
-#. / 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/components/stock.vala:28
+msgid "_Print..."
+msgstr "ה_דפסה…"
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "עכשיו"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_הסרה"
 
-#: ../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "לפני דקה"
-msgstr[1] "לפני %d דקות"
-msgstr[2] "לפני שתי דקות"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_שמירה"
 
-#: ../src/client/util/util-date.vala:171
-#, c-format
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "לפני שעה"
-msgstr[1] "לפני %d שעות"
-msgstr[2] "לפני שעתיים"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "חיפוש בכל חשבונות הדואר עם צירוף מקשים (Ctrl+ד)"
 
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "אתמול"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "מפתוּח חשבון %s"
 
-#. / 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"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(ללא נושא)"
+#~ msgid "Geary Mail"
+#~ msgstr "דואר אלקטרוני Geary"
 
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "בתים"
+#~ msgid "Send and receive email"
+#~ msgstr "שליחה וקבלה של דוא״ל"
 
-#: ../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "ט״ב"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "דוא״ל;דואר אלקטרוני;דואר;"
 
-#: ../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "ג״ב"
+#~ msgid "Compose Message"
+#~ msgstr "יצירת הודעה"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "מ״ב"
+#~ msgid "Send by email"
+#~ msgstr "שליחה על ידי דוא״ל"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "ק״ב"
+#~ msgid "Send files using Geary"
+#~ msgstr "שליחת קבצים באמצעות Geary"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#~ msgid "_Donate"
+#~ msgstr "_תרומה"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "דוא״ל Yahoo"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr "<span weight=\"bold\" size=\"larger\">לא ניתן למחוק משתמש</span> "
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr "חלון כתיבה הקשור במשתמש זה פתוח כרגע. שלח או מחק את ההודעה ונסה שוב."
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "אחר"
+#~ msgid "Add account"
+#~ msgstr "הוספת חשבון"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#~ msgid "Edit account"
+#~ msgstr "עריכת חשבון"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#~ msgid "Remove account"
+#~ msgstr "הסרת חשבון"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "דואר נכנס"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "יש להמתין כאשר Geary מאמת את החשבון שלך."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "טיוטות"
+#~ msgid "Untrusted Connection"
+#~ msgstr "חיבור לא מהימן"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "דואר יוצא"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "_תמיד לבטוח בשרת זה"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "מסומן בכוכב"
+#~ msgid "_Trust This Server"
+#~ msgstr "_לבטוח בשרת זה"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "חשוב"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "ל_א לבטוח בשרת זה"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "כל ההודעות"
+#~ msgid "_Undo"
+#~ msgstr "_ביטול"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "דואר זבל"
+#~ msgid "_Redo"
+#~ msgstr "ביצוע _שוב"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "אשפה"
+#~ msgid "Cu_t"
+#~ msgstr "_גזירה"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "בהמתנה לשליחה"
+#~ msgid "_Paste"
+#~ msgstr "הד_בקה"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "ארכיון"
+#~ msgid "_Left"
+#~ msgstr "_שמאל"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-msgstr "כלום"
+#~ msgid "_Right"
+#~ msgstr "_ימין"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-msgid "attachment"
-msgstr "מצורף"
+#~ msgid "_Center"
+#~ msgstr "_מרכז"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
-msgstr "מוסתר"
+#~ msgid "_Justify"
+#~ msgstr "יישו_ר"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
-msgstr "גוף"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "קישור (Ctrl+ך)"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "cc"
-msgstr "עותק"
+#~ msgid "C_olor"
+#~ msgstr "_צבע"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
-msgstr "מאת"
+#~ msgid "More options"
+#~ msgstr "אפשרויות נוספות"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-msgid "subject"
-msgstr "נושא"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "ציטוט טקסט (Ctrl+])"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
-msgstr "אל"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "סוף ציטוט טקסט (Ctrl+[)"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
-msgstr "אני"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "הסרת עיצוב (Ctrl+רווח)"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-msgid "Drafts | Draft"
-msgstr "טיוטות | טיוטה | Drafts | Draft"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "הדבקה עם עי_צוב"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "דואר יוצא | דואר נשלח | Sent | Sent Mail | Sent Email | Sent E-Mail"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "מודגש (Ctrl+נ)"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-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"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "נטוי (Ctrl+ן)"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "אשפה | זבל | Trash | Rubbish | Rubbish Bin"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "קו תחתי (Ctrl+ו)"
 
-#. List of folder names to match for Archive, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
-msgid "Archive | Archives"
-msgstr "ארכיון | ארכיב | ארכיונים | ארכיבים | Archive | Archives"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "קו חוצה (Ctrl+ל)"
 
-#. / 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:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %b %-e, %Y בשעה %-l:%M %p"
+#~ msgid "_Rich Text"
+#~ msgstr "טקסט _עשיר"
 
-#. / 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:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "בתאריך %1$s, %2$s כתב:"
+#~ msgid "Show Extended Fields"
+#~ msgstr "הצגת שדות מורחבים"
 
-#. / 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:228
-#, c-format
-msgid "%s wrote:"
-msgstr "נכתב על ידי %s:"
+#~ msgctxt "Label"
+#~ msgid "Close and Save"
+#~ msgstr "סגירה ושמירה"
 
-#. / 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:234
-#, c-format
-msgid "On %s:"
-msgstr "בתאריך %s:"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "סגירה ושמירה"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "---------- הודעה שהועברה ----------"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "סגירה ושמירה"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "מאת: %s\n"
+#~ msgctxt "Label"
+#~ msgid "Close and Discard"
+#~ msgstr "סגירה והשלכה"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "נושא: %s\n"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "סגירה והשלכה"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "תאריך: %s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "סגירה והשלכה"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "אל: %s\n"
+#~ msgid "Lar_ge"
+#~ msgstr "_גדול"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
-msgstr "עותק: %s\n"
+#~ msgid "Large"
+#~ msgstr "גדול"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">לא ניתן למחוק משתמש</span>"
+#~ msgid "_Medium"
+#~ msgstr "_בינוני"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr "חלון כתיבה הקשור במשתמש זה פתוח כרגע. שלח או מחק את ההודעה ונסה שוב."
+#~ msgid "Medium"
+#~ msgstr "בינוני"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "הוספת חשבון"
+#~ msgid "_Small"
+#~ msgstr "_קטן"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "עריכת חשבון"
+#~ msgid "Small"
+#~ msgstr "קטן"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "הסרת חשבון"
+#~ msgid "S_ans Serif"
+#~ msgstr "_בלתי מעוטר"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "יש להמתין כאשר Geary מאמת את החשבון שלך."
+#~ msgid "Sans Serif"
+#~ msgstr "בלתי מעוטר"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "חיבור לא מהימן"
+#~ msgid "S_erif"
+#~ msgstr "_מעוטר"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "_תמיד לבטוח בשרת זה"
+#~ msgid "Serif"
+#~ msgstr "מעוטר"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "_לבטוח בשרת זה"
+#~ msgid "_Fixed Width"
+#~ msgstr "_רוחב קבוע"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "ל_א לבטוח בשרת זה"
+#~ msgid "Fixed Width"
+#~ msgstr "רוחב קבוע"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_ביטול"
+#~ msgid "Detach"
+#~ msgstr "ניתוק"
 
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "ביצוע _שוב"
-
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "_גזירה"
-
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "הד_בקה"
-
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_שמאל"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_ימין"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_מרכז"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "יישו_ר"
-
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "קישור (Ctrl+ך)"
-
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "_צבע"
-
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "אפשרויות נוספות"
-
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "ציטוט טקסט (Ctrl+])"
-
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "סוף ציטוט טקסט (Ctrl+[)"
-
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "הסרת עיצוב (Ctrl+רווח)"
-
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "הדבקה עם עי_צוב"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "מודגש (Ctrl+נ)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "נטוי (Ctrl+ן)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "קו תחתי (Ctrl+ו)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "קו חוצה (Ctrl+ל)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "טקסט _עשיר"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "הצגת שדות מורחבים"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "סגירה ושמירה"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "סגירה ושמירה"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "סגירה ושמירה"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "סגירה והשלכה"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "סגירה והשלכה"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "סגירה והשלכה"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "_גדול"
-
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "גדול"
-
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "_בינוני"
-
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "בינוני"
-
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "_קטן"
-
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "קטן"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "_בלתי מעוטר"
-
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "בלתי מעוטר"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "_מעוטר"
-
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "מעוטר"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "_רוחב קבוע"
-
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "רוחב קבוע"
-
-#: ../ui/composer.glade.h:42
-msgid "Detach"
-msgstr "ניתוק"
-
-#: ../ui/composer.glade.h:43
-msgid "Detach (Ctrl+D)"
-msgstr "ניתוק (Ctrl+ג)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_שליחה"
-
-#: ../ui/composer.glade.h:45
-msgid "Send"
-msgstr "שליחה"
-
-#: ../ui/composer.glade.h:46
-msgid "Send (Ctrl+Enter)"
-msgstr "שליחה (Ctrl+Enter)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "_צירוף קובץ"
-
-#: ../ui/composer.glade.h:48
-msgid "Attach File"
-msgstr "צירוף קובץ"
-
-#: ../ui/composer.glade.h:49
-msgid "_Include Original Attachments"
-msgstr "_לכלול את הקבצים המצורפים המקוריים"
-
-#: ../ui/composer.glade.h:50
-msgid "Include Original Attachments"
-msgstr "לכלול את הקבצים המצורפים המקוריים"
-
-#: ../ui/composer.glade.h:51
-msgid "Application Menu"
-msgstr "תפריט יישום"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:53
-msgid "_To"
-msgstr "_אל"
-
-#: ../ui/composer.glade.h:54
-msgid "_Cc"
-msgstr "_עותק"
-
-#: ../ui/composer.glade.h:55
-msgid "_Subject"
-msgstr "_נושא"
-
-#: ../ui/composer.glade.h:56
-msgid "_Bcc"
-msgstr "עותק _מוסתר"
-
-#: ../ui/composer.glade.h:57
-msgid "_Reply-To"
-msgstr "לה_שיב אל"
-
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:59
-msgid "From"
-msgstr "מאת"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "ניתוק (Ctrl+ג)"
 
-#: ../ui/composer.glade.h:60
-msgid "Drop files here"
-msgstr "יש לגרור קבצים לכאן"
+#~ msgid "_Send"
+#~ msgstr "_שליחה"
 
-#: ../ui/composer.glade.h:61
-msgid "To add them as attachments"
-msgstr "כדי להוסיף אותם כקבצים מצורפים"
+#~ msgid "Send"
+#~ msgstr "שליחה"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-msgid "Remove email address"
-msgstr "מחיקת כתובת דוא״ל"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "שליחה (Ctrl+Enter)"
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"כמה שרתי דואר דורשים כתובות נוספות להגדרה על השרת. יש ליצור קשר עם\n"
-"ספק הדוא״ל שלך למיד נוסף."
+#~ msgid "_Attach File"
+#~ msgstr "_צירוף קובץ"
 
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "_עדכון"
+#~ msgid "Attach File"
+#~ msgstr "צירוף קובץ"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "חיפוש:"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_לכלול את הקבצים המצורפים המקוריים"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "ה_קודם"
+#~ msgid "Include Original Attachments"
+#~ msgstr "לכלול את הקבצים המצורפים המקוריים"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "ה_בא"
+#~ msgid "Application Menu"
+#~ msgstr "תפריט יישום"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "התאמת _רישיות"
+#~ msgid "_To"
+#~ msgstr "_אל"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "תוויות"
+#~ msgid "_Cc"
+#~ msgstr "_עותק"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "ססמה"
+#~ msgid "_Subject"
+#~ msgstr "_נושא"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "כתובת _דוא״ל"
+#~ msgid "_Bcc"
+#~ msgstr "עותק _מוסתר"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_ססמה"
+#~ msgid "_Reply-To"
+#~ msgstr "לה_שיב אל"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "ש_רות"
+#~ msgid "From"
+#~ msgstr "מאת"
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "_שם"
+#~ msgid "Drop files here"
+#~ msgstr "יש לגרור קבצים לכאן"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "_כינוי"
+#~ msgid "To add them as attachments"
+#~ msgstr "כדי להוסיף אותם כקבצים מצורפים"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "עבודה, בית וכו׳"
+#~ msgid "Remove email address"
+#~ msgstr "מחיקת כתובת דוא״ל"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_שמירת דואר יוצא"
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "כמה שרתי דואר דורשים כתובות נוספות להגדרה על השרת. יש ליצור קשר עם\n"
+#~ "ספק הדוא״ל שלך למיד נוסף."
 
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
-msgstr "כתובות דוא״ל _נוספות…"
+#~ msgid "_Update"
+#~ msgstr "_עדכון"
 
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "הגדרות IMAP"
+#~ msgid "Find:"
+#~ msgstr "חיפוש:"
 
-#: ../ui/login.glade.h:12
-msgid "Se_rver"
-msgstr "_שרת"
+#~ msgid "_Previous"
+#~ msgstr "ה_קודם"
 
-#: ../ui/login.glade.h:13
-msgid "P_ort"
-msgstr "_פתחה"
+#~ msgid "_Next"
+#~ msgstr "ה_בא"
 
-#: ../ui/login.glade.h:14
-msgid "Ser_ver"
-msgstr "ש_רת"
+#~ msgid "_Case sensitive"
+#~ msgstr "התאמת _רישיות"
 
-#: ../ui/login.glade.h:15
-msgid "Por_t"
-msgstr "_פתחה"
+#~ msgid "label"
+#~ msgstr "תוויות"
 
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "הגדרות SMTP"
+#~ msgid "Password"
+#~ msgstr "ססמה"
 
-#: ../ui/login.glade.h:17
-msgid "User_name"
-msgstr "שם מ_שתמש"
+#~ msgid "E_mail address"
+#~ msgstr "כתובת _דוא״ל"
 
-#: ../ui/login.glade.h:18
-msgid "Pass_word"
-msgstr "_ססמה"
+#~ msgid "_Password"
+#~ msgstr "_ססמה"
 
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr "שם משתמש SMTP"
+#~ msgid "S_ervice"
+#~ msgstr "ש_רות"
 
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr "ססמת SMTP"
+#~ msgid "N_ame"
+#~ msgstr "_שם"
 
-#: ../ui/login.glade.h:21
-msgid "_Username"
-msgstr "שם _משתמש"
+#~ msgid "N_ickname"
+#~ msgstr "_כינוי"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr "שם משתמש IMAP"
+#~ msgid "Work, Home, etc."
+#~ msgstr "עבודה, בית וכו׳"
 
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr "ססמת IMAP"
+#~ msgid "_Save sent mail"
+#~ msgstr "_שמירת דואר יוצא"
 
-#: ../ui/login.glade.h:24
-msgid "Encr_yption"
-msgstr "ה_צפנה"
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "כתובות דוא״ל _נוספות…"
 
-#: ../ui/login.glade.h:25
-msgid "Encrypt_ion"
-msgstr "ה_צפנה"
+#~ msgid "IMAP settings"
+#~ msgstr "הגדרות IMAP"
 
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "Se_rver"
+#~ msgstr "_שרת"
 
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "P_ort"
+#~ msgstr "_פתחה"
 
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "לא נדרש אי_מות"
+#~ msgid "Ser_ver"
+#~ msgstr "ש_רת"
 
-#: ../ui/login.glade.h:30
-msgid "Use IMAP cre_dentials"
-msgstr "שימוש ב_אישורי IMAP"
+#~ msgid "Por_t"
+#~ msgstr "_פתחה"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "חיבור הודעות"
+#~ msgid "SMTP settings"
+#~ msgstr "הגדרות SMTP"
 
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr "שמירת _טיוטה על השרת"
+#~ msgid "User_name"
+#~ msgstr "שם מ_שתמש"
 
-#: ../ui/login.glade.h:33
-msgid "Si_gn emails (HTML allowed):"
-msgstr "_חתימת הודעות (HTML מאופשר):"
+#~ msgid "Pass_word"
+#~ msgstr "_ססמה"
 
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "אחסון"
+#~ msgid "SMTP username"
+#~ msgstr "שם משתמש SMTP"
 
-#: ../ui/login.glade.h:35
-msgid "_Download mail"
-msgstr "הורדת _דוא״ל"
+#~ msgid "SMTP password"
+#~ msgstr "ססמת SMTP"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "אישורי SMTP"
+#~ msgid "_Username"
+#~ msgstr "שם _משתמש"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "שם משתמש"
+#~ msgid "IMAP username"
+#~ msgstr "שם משתמש IMAP"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "שמירת ה_ססמה"
+#~ msgid "IMAP password"
+#~ msgstr "ססמת IMAP"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "אי_מות"
+#~ msgid "Encr_yption"
+#~ msgstr "ה_צפנה"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "קריאה"
+#~ msgid "Encrypt_ion"
+#~ msgstr "ה_צפנה"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "_בחירת ההודעה הבאה אוטומטית"
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "הצגת תצוגה מ_קדימה של שיחה"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr "שימוש ב_שלוש חלוניות תצוגה"
+#~ msgid "No authentication re_quired"
+#~ msgstr "לא נדרש אי_מות"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "הפעלת בדיקת _איות"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "שימוש ב_אישורי IMAP"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "התרעות"
+#~ msgid "Composer"
+#~ msgstr "חיבור הודעות"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "ה_שמעת צלילי התרעה"
+#~ msgid "Save dra_fts on server"
+#~ msgstr "שמירת _טיוטה על השרת"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "הצגת התרעות על _קבלת דואר חדש"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "_חתימת הודעות (HTML מאופשר):"
 
-#: ../ui/preferences.glade.h:10
-msgid "Always _watch for new mail"
-msgstr "תמיד ל_צפות עבור הודעות חדשות"
+#~ msgid "Storage"
+#~ msgstr "אחסון"
 
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr "‏Geary ירוץ ברקע ויודיע על הודעות חדשות"
+#~ msgid "_Download mail"
+#~ msgstr "הורדת _דוא״ל"
 
-#: ../ui/preferences.glade.h:12
-msgid "Preferences"
-msgstr "העדפות"
+#~ msgid "SMTP Credentials"
+#~ msgstr "אישורי SMTP"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">האם אכן ברצונך למחוק משתמש זה?</span>"
+#~ msgid "Username"
+#~ msgstr "שם משתמש"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"כל ההודעות הקשורות במשתמש זה יוסרו מהמחשב שלך. התהליך לא ישפיע על ההודעות "
-"שבשרת."
+#~ msgid "_Remember password"
+#~ msgstr "שמירת ה_ססמה"
+
+#~ msgid "_Authenticate"
+#~ msgstr "אי_מות"
+
+#~ msgid "Reading"
+#~ msgstr "קריאה"
+
+#~ msgid "_Automatically select next message"
+#~ msgstr "_בחירת ההודעה הבאה אוטומטית"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "הצגת תצוגה מ_קדימה של שיחה"
+
+#~ msgid "Use _three pane view"
+#~ msgstr "שימוש ב_שלוש חלוניות תצוגה"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "הפעלת בדיקת _איות"
+
+#~ msgid "Notifications"
+#~ msgstr "התרעות"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "ה_שמעת צלילי התרעה"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "הצגת התרעות על _קבלת דואר חדש"
+
+#~ msgid "Always _watch for new mail"
+#~ msgstr "תמיד ל_צפות עבור הודעות חדשות"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr "‏Geary ירוץ ברקע ויודיע על הודעות חדשות"
+
+#~ msgid "Preferences"
+#~ msgstr "העדפות"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">האם אכן ברצונך למחוק משתמש זה?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "כל ההודעות הקשורות במשתמש זה יוסרו מהמחשב שלך. התהליך לא ישפיע על ההודעות "
+#~ "שבשרת."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "כינוי:"
+#~ msgid "Nickname:"
+#~ msgstr "כינוי:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "כתובת דוא״ל:"
+#~ msgid "Email address:"
+#~ msgstr "כתובת דוא״ל:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "‏Geary בתהליך שדרוג…"
+#~ msgid "Geary update in progress…"
+#~ msgstr "‏Geary בתהליך שדרוג…"
 
 #~ msgid "No conversations selected"
 #~ msgstr "לא נבחרה אף תכתובת"
@@ -2147,7 +1869,6 @@ msgstr "‏Geary בתהליך שדרוג…"
 #~ msgid_plural "%u conversations selected"
 #~ msgstr[0] "נבחרה תכתובת אחת."
 #~ msgstr[1] "נבחרו %u תכתובות."
-#~ msgstr[2] "נבחרו שתי תכתובות."
 
 #~ msgid "Notify of new mail at start_up"
 #~ msgstr "התרעה על קבלת דואר חדש בעת ה_פעלה"
diff --git a/po/hi.po b/po/hi.po
index 6ee6a18..c70a4bc 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -9,1499 +9,1437 @@ 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-20 19:28+0000\n"
-"Last-Translator: yorbajim <jim yorba org>\n"
-"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/geary/";
-"language/hi_IN/)\n"
-"Language: hi_IN\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:04+0000\n"
+"Last-Translator: Jim Nelson <jim yorba org>\n"
+"Language-Team: Hindi (India) "
+"(http://www.transifex.com/projects/p/geary/language/hi_IN/)\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"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:54+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: hi_IN\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:641
-msgid "        &#8226; Connection error.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:624
-msgid "        &#8226; Email address already added to Geary.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:628
-msgid "        &#8226; IMAP connection error.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:631
-msgid "        &#8226; IMAP username or password incorrect.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:621
-msgid "        &#8226; Invalid account nickname.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:634
-msgid "        &#8226; SMTP connection error.\n"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; SMTP username or password incorrect.\n"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:645
-msgid "        &#8226; Username or password incorrect.\n"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1203
-msgid " (Invalid?)"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:972
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "महत्वपूर्ण"
 
-#: ../../src/client/composer/composer-window.vala:937
-#, c-format
-msgid "\"%s\" could not be found."
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:965
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "\"%s\" नहीं खोली जा सकी।"
-
-#: ../../src/client/composer/composer-window.vala:944
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" एक फ़ोल्डर है।"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:951
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" एक ख़ाली फ़ाइल है।"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
 msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
 msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
 msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
 msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
 msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
 msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
 msgstr ""
 
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] ""
-msgstr[1] ""
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "याहू ! मेल"
 
-#: ../../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d नया संदेश"
-msgstr[1] "%d नए संदेश"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr ""
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:43
-#, c-format
-msgid "%d results"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
 msgstr ""
 
-#. / 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] ""
-msgstr[1] ""
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr ""
 
-#: ../../src/client/util/util-date.vala:170
-#, c-format
-msgid "%dh ago"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
 msgstr ""
 
-#: ../../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
 msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:222
-#, c-format
-msgid "%i matches"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
 msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:224
-#, c-format
-msgid "%i matches (wrapped)"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
 msgstr ""
 
-#. / 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"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
 msgstr ""
 
-#. / 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"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
 msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:107
-#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
-msgstr[1] ""
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr ""
 
-#. / 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)"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
 msgstr ""
 
-#: ../../src/client/views/conversation-web-view.vala:289
-#, c-format
-msgid "%s - Conversation Inspector"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
 msgstr ""
 
-#: ../../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - नए संदेश"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr ""
 
 #. / 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
+#: ../src/engine/rfc822/rfc822-utils.vala:228
 msgid "%s wrote:"
 msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] ""
-msgstr[1] ""
+#. / 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:234
+msgid "On %s:"
+msgstr ""
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:246
-#, c-format
-msgid "%u conversations selected."
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:743
-#, c-format
-msgid "%u read messages"
-msgstr "%u पढे हुए संदेश"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "विषय: %s\n"
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
 msgstr ""
 
-#: ../../src/client/util/util-email.vala:30
-msgid "(no subject)"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
 msgstr ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:211
-msgid "1 month back"
-msgstr "1 महीने पहले"
-
-#: ../../src/client/accounts/add-edit-page.vala:214
-msgid "1 year back"
-msgstr "1 साल पहले"
-
-#: ../../src/client/accounts/add-edit-page.vala:210
-msgid "2 weeks back"
-msgstr "2 महीने पहले"
-
-#: ../../src/client/accounts/add-edit-page.vala:212
-msgid "3 months back"
-msgstr "3 महीने पहले"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:213
-msgid "6 months back"
-msgstr "6 महीने पहले"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">क्या आप सुनिश्चित हैं कि आप इस खाते को हटाना "
-"चाहते हैं?</span> "
 
-#: ../../ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
 msgstr ""
 
-#: ../../ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1491
-#, c-format
-msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+#: ../src/client/application/geary-controller.vala:62
+msgid "Delete conversation (Shift+Delete)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:245
-msgid "A_ccounts"
+#: ../src/client/application/geary-controller.vala:63
+msgid "Delete conversations (Shift+Delete)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1227
-#, c-format
-msgid "About %s"
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr ""
 
-#: ../../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "खाते"
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../../ui/account_list.glade:71
-msgid "Add account"
+#: ../src/client/application/geary-controller.vala:72
+msgid "_Archive"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:304
-msgid "Add label"
+#: ../src/client/application/geary-controller.vala:73
+msgid "Archive conversation (A)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:57
-msgid "Add label to conversation"
+#: ../src/client/application/geary-controller.vala:74
+msgid "Archive conversations (A)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:58
-msgid "Add label to conversations"
+#: ../src/client/application/geary-controller.vala:77
+msgid "Mark as S_pam"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
+#: ../src/client/application/geary-controller.vala:78
+msgid "Mark as not S_pam"
 msgstr ""
 
-#: ../../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."
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
+msgid "Mark conversation"
 msgstr ""
-"इस खाते से संबंधित सभी ईमेल आपके कंप्यूटर से हटा दिये जाएंगे । इससे सर्वर पर कोई प्रभाव नहीं "
-"पड़ेगा।"
 
-#: ../../src/client/geary-args.vala:24
-msgid "Allow inspection of WebView"
+#: ../src/client/application/geary-controller.vala:81
+msgid "Mark conversations"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:509
-msgid "Always Show From Sender"
+#: ../src/client/application/geary-controller.vala:82
+msgid "Add label to conversation"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
+#: ../src/client/application/geary-controller.vala:83
+msgid "Add label to conversations"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:48
-msgid "Archive conversation (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
+msgid "Move conversation"
+msgstr "वार्तालप का स्थान परिवर्तन करें"
+
+#: ../src/client/application/geary-controller.vala:85
+msgid "Move conversations"
+msgstr "वार्तालपों का स्थान परिवर्तन करें"
+
+#: ../src/client/application/geary-controller.vala:372
+msgid "A_ccounts"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:49
-msgid "Archive conversations (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:377
+#: ../src/client/components/stock.vala:27
+msgid "_Preferences"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1477
-#, c-format
-msgid "Are you sure you want to open \"%s\"?"
+#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/components/stock.vala:25
+msgid "_Help"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1478
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
+#: ../src/client/application/geary-controller.vala:385
+#: ../src/client/components/stock.vala:21
+msgid "_About"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:614
-msgid "Bcc:"
+#: ../src/client/application/geary-controller.vala:389
+#: ../src/client/components/stock.vala:29
+msgid "_Quit"
 msgstr ""
 
-#: ../../ui/composer.glade:113
-msgid "Bold (Ctrl+B)"
+#: ../src/client/application/geary-controller.vala:394
+msgid "_Mark as..."
 msgstr ""
 
-#: ../../ui/composer.glade:69
-msgid "C_olor"
+#: ../src/client/application/geary-controller.vala:400
+msgid "Mark as _Read"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:926
-msgid "Cannot add attachment"
+#: ../src/client/application/geary-controller.vala:406
+msgid "Mark as _Unread"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:611
-msgid "Cc:"
+#: ../src/client/application/geary-controller.vala:412
+msgid "_Star"
 msgstr ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
+#: ../src/client/application/geary-controller.vala:417
+msgid "U_nstar"
 msgstr ""
 
-#: ../../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
+#: ../src/client/application/geary-controller.vala:427
+msgid "Add label"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:553
-msgid "Co_ntinue"
+#: ../src/client/application/geary-controller.vala:428
+msgid "_Label"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:29
-msgid "Compose Message"
+#: ../src/client/application/geary-controller.vala:432
+msgid "_Move"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:313
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr ""
 
-#: ../../ui/preferences.glade:117
-msgid "Composer"
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
+msgid "_Reply"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:897
-msgid "Copy _Email Address"
+#: ../src/client/application/geary-controller.vala:441
+msgid "Reply (Ctrl+R, R)"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:902
-msgid "Copy _Link"
+#: ../src/client/application/geary-controller.vala:445
+msgid "R_eply All"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr "सत्त्वाधिकार 2011-2013 योरबा फ़ाउंडेशन"
-
-#: ../../ui/composer.glade:21
-msgid "Cu_t"
+#: ../src/client/application/geary-controller.vala:446
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:620
-msgid "Date:"
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
+msgid "_Forward"
 msgstr ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
+#: ../src/client/application/geary-controller.vala:452
+msgid "Forward (Ctrl+L, F)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:43
-msgid "Delete conversation (Delete, Backspace, A)"
-msgstr "वार्तालाप को मिटाएं (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:44
-msgid "Delete conversations (Delete, Backspace, A)"
-msgstr "वार्तालापों को मिटाएं (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:25
-msgid "Display program version"
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:663
-msgid "Do you want to discard the unsaved message?"
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:666
-msgid "Do you want to discard this message?"
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1479
-msgid "Don't _ask me again"
+#: ../src/client/application/geary-controller.vala:746
+msgid "Unable to store server trust exception"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
+#: ../src/client/application/geary-controller.vala:983
+msgid "Your settings are insecure"
+msgstr "आपकी सेटिंग असुरक्षित हैं।"
+
+#: ../src/client/application/geary-controller.vala:984
+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 ""
 
-#: ../../ui/composer.glade:419
-msgid "Drop files here"
+#: ../src/client/application/geary-controller.vala:985
+msgid "Co_ntinue"
 msgstr ""
 
-#: ../../ui/login.glade:115
-msgid "E_mail address:"
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/components/status-bar.vala:29
+msgid "Error sending email"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:704
-msgid "E_xit"
+#: ../src/client/application/geary-controller.vala:1064
+msgid ""
+"Geary encountered an error sending an email.  If the problem persists, "
+"please manually delete the email from your Outbox folder."
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:533
-msgid "Edit Draft"
+#: ../src/client/application/geary-controller.vala:1068
+#: ../src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
 msgstr ""
 
-#: ../../ui/account_list.glade:84
-msgid "Edit account"
+#: ../src/client/application/geary-controller.vala:1069
+msgid ""
+"Geary encountered an error saving a sent message to Sent Mail.  The message "
+"will stay in your Outbox folder until you delete it."
 msgstr ""
 
-#: ../../ui/remove_confirm.glade:94
-msgid "Email address:"
-msgstr "ईमेल एड्रेस:"
+#: ../src/client/application/geary-controller.vala:1138
+msgid "Labels"
+msgstr ""
 
-#: ../../src/client/geary-application.vala:28
-msgid "Email;E-mail;Mail;"
+#: ../src/client/application/geary-controller.vala:1150
+msgid "Unable to open the database for %s"
 msgstr ""
 
-#: ../../ui/preferences.glade:131
-msgid "Enable _spell checking"
+#: ../src/client/application/geary-controller.vala:1151
+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 ""
 
-#: ../../ui/login.glade:588
-msgid "Encr_yption:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "_Rebuild"
 msgstr ""
 
-#: ../../ui/login.glade:607
-msgid "Encrypt_ion:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "E_xit"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-msgid "Enter your account information to get started."
+#: ../src/client/application/geary-controller.vala:1162
+msgid "Unable to rebuild database for \"%s\""
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:714
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:43
-msgid "Error saving"
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
+msgid "Unable to open local mailbox for %s"
 msgstr ""
 
-#. / 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"
+#: ../src/client/application/geary-controller.vala:1186
+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 ""
 
-#: ../../src/client/accounts/add-edit-page.vala:216
-msgid "Everything"
-msgstr "सब कुछ"
-
-#: ../../src/client/views/conversation-viewer.vala:1897
-msgid "Failed to open default text editor."
+#: ../src/client/application/geary-controller.vala:1196
+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 ""
 
-#: ../../src/client/geary-args.vala:54
-#, c-format
-msgid "Failed to parse command line options: %s\n"
+#: ../src/client/application/geary-controller.vala:1207
+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 ""
 
-#. / 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"
+#: ../src/client/application/geary-controller.vala:1715
+msgid "About %s"
 msgstr ""
 
-#: ../../ui/composer.glade:182
-msgid "Fixed Width"
+#. / 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-controller.vala:1718
+msgid "translator-credits"
 msgstr ""
+"Launchpad Contributions:\n"
+"  Jim Nelson https://launchpad.net/~yorba-jim";
 
-#: ../../src/client/geary-controller.vala:329
-msgid "Forward (Ctrl+L, F)"
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:605
-msgid "From:"
+#: ../src/client/application/geary-controller.vala:1986
+msgid "Are you sure you want to open \"%s\"?"
 msgstr ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
+#: ../src/client/application/geary-controller.vala:1987
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
 msgstr ""
 
-#: ../../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
+#: ../src/client/application/geary-controller.vala:1988
+msgid "Don't _ask me again"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:25
-msgid "Geary Mail"
+#: ../src/client/application/geary-controller.vala:2006
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:626
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
-msgstr ""
-
-#: ../../ui/password-dialog.glade:315
-msgid "General"
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
+#: ../src/client/application/geary-controller.vala:2011
+msgid "_Replace"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:133
-msgid "IMAP Credentials"
+#: ../src/client/application/geary-controller.vala:2309
+msgid "Close open draft messages?"
 msgstr ""
 
-#: ../../ui/login.glade:572
-msgid "IMAP password"
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
 msgstr ""
 
-#: ../../ui/login.glade:286 ../../ui/password-dialog.glade:334
-msgid "IMAP settings"
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
 msgstr ""
 
-#: ../../ui/login.glade:556
-msgid "IMAP username"
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "महत्वपूर्ण"
-
-#: ../../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
 msgstr ""
 
-#: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "इनबौक्स"
-
-#: ../../src/client/ui/main-toolbar.vala:163
-#, c-format
-msgid "Indexing %s account"
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
 msgstr ""
 
-#: ../../ui/composer.glade:120
-msgid "Italic (Ctrl+I)"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:2489
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
+#: ../src/client/application/geary-controller.vala:2491
+msgid "Delete"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:689
-msgid "Labels"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
 msgstr ""
 
-#: ../../ui/composer.glade:151
-msgid "Lar_ge"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
 msgstr ""
 
-#: ../../ui/composer.glade:152
-msgid "Large"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
 msgstr ""
 
-#: ../../ui/composer.glade:62
-msgid "Link (Ctrl+L)"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
 msgstr ""
 
-#. / 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"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:11
+#: ../src/client/application/geary-args.vala:12
 msgid "Log conversation monitoring"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:21
-msgid "Log database queries (generates lots of messages)"
-msgstr ""
-
-#. / "Normalization" can also be called "synchronization"
-#: ../../src/client/geary-args.vala:23
-msgid "Log folder normalization"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:13
+#: ../src/client/application/geary-args.vala:14
 msgid "Log network activity"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:12
-msgid "Log network deserialization"
+#. / 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 ""
 
 #. / Serialization is how commands and responses are converted into a stream of bytes for
 #. / network transmission
-#: ../../src/client/geary-args.vala:19
+#: ../src/client/application/geary-args.vala:20
 msgid "Log network serialization"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:20
+#: ../src/client/application/geary-args.vala:21
 msgid "Log periodic activity"
 msgstr ""
 
-#: ../../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr ""
-
-#: ../../src/client/geary-application.vala:26
-msgid "Mail Client"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1479
-msgid "Mark Unread From _Here"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:52
-msgid "Mark as S_pam"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:277
-msgid "Mark as _Read"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:283
-msgid "Mark as _Unread"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:53
-msgid "Mark as not S_pam"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:55
-#: ../../src/client/geary-controller.vala:269
-msgid "Mark conversation"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:56
-msgid "Mark conversations"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
 msgstr ""
 
-#: ../../src/client/views/formatted-conversation-data.vala:11
-msgid "Me"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
 msgstr ""
 
-#: ../../ui/composer.glade:158
-msgid "Medium"
-msgstr ""
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - नए संदेश"
 
-#: ../../ui/composer.glade:75
-msgid "More options"
-msgstr ""
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d नया संदेश"
+msgstr[1] "%d नए संदेश"
 
-#: ../../src/client/geary-controller.vala:59
-#: ../../src/client/geary-controller.vala:308
-msgid "Move conversation"
-msgstr "वार्तालप का स्थान परिवर्तन करें"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/geary-controller.vala:60
-msgid "Move conversations"
-msgstr "वार्तालपों का स्थान परिवर्तन करें"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:176
-msgid "N_ame:"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
 msgstr ""
 
-#: ../../ui/login.glade:230
-msgid "N_ickname:"
-msgstr "उपनाम"
-
-#: ../../src/client/composer/composer-window.vala:40
-msgid "New Message"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
 msgstr ""
 
-#: ../../ui/remove_confirm.glade:80
-msgid "Nickname:"
-msgstr "उपनाम:"
-
-#: ../../ui/login.glade:661
-msgid "No authentication re_quired"
-msgstr "प्रमाणीकरण की आवश्यकता नहीं"
-
-#: ../../src/client/views/conversation-viewer.vala:275
-msgid "No conversations in folder."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:244
-msgid "No conversations selected."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:273
-msgid "No search results found."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:128
-#: ../../src/engine/api/geary-special-folder-type.vala:58
-msgid "None"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
 msgstr ""
 
-#: ../../ui/preferences.glade:158
-msgid "Notifications"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
 msgstr ""
 
-#: ../../src/client/util/util-date.vala:164
-msgid "Now"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
 msgstr ""
 
-#. / 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:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
 msgstr ""
 
-#. / 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:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
 msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:160
-msgid "Open"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
 msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
 msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:10
-msgid "Output debugging information"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
 msgstr ""
 
-#: ../../ui/login.glade:337
-msgid "P_ort:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
 msgstr ""
 
-#: ../../ui/login.glade:474
-msgid "Pass_word:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
 msgstr ""
 
-#: ../../ui/login.glade:101
-msgid "Password"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:196
-msgid "Password:"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
 msgstr ""
 
-#: ../../ui/composer.glade:102
-msgid "Paste _With Formatting"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your email password"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:47
-msgid "Please report comments, suggestions and bugs to:"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "खाते"
+
+#. / 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 ""
 
-#: ../../ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
-msgstr "कृपया प्रतीक्षा करें, गीयरी आपके खाते की पुष्टि कर रहा है."
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "गीयरी में आपका स्वागत है ।"
 
-#: ../../ui/login.glade:421
-msgid "Por_t:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
 msgstr ""
 
-#: ../../ui/password-dialog.glade:367 ../../ui/password-dialog.glade:470
-msgid "Port:"
-msgstr ""
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 महीने पहले"
 
-#: ../../ui/composer.glade:81
-msgid "Quote text  (Ctrl+])"
-msgstr ""
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 महीने पहले"
 
-#: ../../src/client/geary-controller.vala:322
-msgid "R_eply All"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 महीने पहले"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 महीने पहले"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 साल पहले"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
 msgstr ""
 
-#: ../../ui/preferences.glade:55
-msgid "Reading"
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:274
-msgid "Real name:"
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "सब कुछ"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:590
-msgid "Remem_ber password"
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:583
+#: ../src/client/accounts/add-edit-page.vala:723
 msgid "Remem_ber passwords"
 msgstr ""
 
-#: ../../ui/account_list.glade:97
-msgid "Remove account"
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
 msgstr ""
 
-#: ../../ui/composer.glade:95
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "प्रारूपण हटाएं (Ctrl+Space)"
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "पुष्टि नहीं हो पाई:\n"
 
-#: ../../src/client/geary-controller.vala:318
-msgid "Reply (Ctrl+R, R)"
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:323
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1452
-msgid "Reply to _All"
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:163
-msgid "SMTP Credentials"
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
 msgstr ""
 
-#: ../../ui/login.glade:507
-msgid "SMTP password"
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
 msgstr ""
 
-#: ../../ui/login.glade:439 ../../ui/password-dialog.glade:437
-msgid "SMTP settings"
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
 msgstr ""
 
-#: ../../ui/login.glade:491
-msgid "SMTP username"
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:124
-msgid "SSL"
-msgstr "SSL"
-
-#: ../../ui/password-dialog.glade:382 ../../ui/password-dialog.glade:485
-msgid "SSL/TLS encryption:"
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:126
-msgid "STARTTLS"
-msgstr "STARTTLS"
-
-#: ../../ui/composer.glade:169
-msgid "S_ans Serif"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
 msgstr ""
 
-#: ../../ui/composer.glade:175
-msgid "S_erif"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
 msgstr ""
 
-#: ../../ui/login.glade:160
-msgid "S_ervice:"
+#. / 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 ""
 
-#: ../../ui/composer.glade:170
-msgid "Sans Serif"
+#. / 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 ""
 
-#: ../../src/client/views/conversation-viewer.vala:1437
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../src/client/views/conversation-viewer.vala:1400
-msgid "Save All A_ttachments..."
+#. / 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 ""
 
-#: ../../src/client/composer/composer-window.vala:41
-msgid "Saved"
+#. / 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 ""
 
-#: ../../src/client/composer/composer-window.vala:42
-msgid "Saving"
+#. / 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 ""
 
-#: ../../ui/login.glade:304
-msgid "Se_rver:"
+#. / 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 ""
 
-#: ../../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"
+#. / 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 ""
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:39
-#: ../../src/client/ui/main-toolbar.vala:170
-#, c-format
-msgid "Search %s account"
+#. / 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 ""
 
-#: ../../src/client/ui/main-toolbar.vala:76
-msgid "Search all mail in account for keywords (Ctrl+S)"
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:1243
-msgid "Select Color"
-msgstr "रंग चुनें"
-
-#: ../../src/client/ui/stock.vala:32
-#: ../../src/client/views/conversation-viewer.vala:916
-msgid "Select _All"
-msgstr ""
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/views/conversation-viewer.vala:910
-msgid "Select _Message"
-msgstr ""
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/geary-application.vala:27
-msgid "Send and receive email"
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:747
-msgid "Send message with an empty body?"
+#. / 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
+msgid "%A"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:743
-msgid "Send message with an empty subject and body?"
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:745
-msgid "Send message with an empty subject?"
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:749
-msgid "Send message without an attachment?"
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
 msgstr ""
 
-#. / 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..."
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
 msgstr ""
 
-#: ../../ui/login.glade:404
-msgid "Ser_ver:"
-msgstr ""
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:176
-msgid "Serif"
-msgstr ""
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/password-dialog.glade:352 ../../ui/password-dialog.glade:455
-msgid "Server:"
+#. / 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
+msgid "%s, %s"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:259
-msgid "Service:"
-msgstr ""
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "इनबौक्स"
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "Show Images"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
 msgstr ""
 
-#: ../../ui/preferences.glade:193
-msgid "Show _notifications for new mail"
-msgstr ""
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:164
-msgid "Small"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
 msgstr ""
 
-#: ../../ui/login.glade:761
-msgid "Storage"
-msgstr "भंडार"
-
-#: ../../ui/composer.glade:134
-msgid "Strikethrough (Ctrl+K)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:617
-msgid "Subject:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
 msgstr ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr "विषय: %s\n"
-
-#: ../../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1493
-#, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:747
-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."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
 msgstr ""
 
-#: ../../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."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
 msgstr ""
 
-#: ../../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"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
 msgstr ""
 
-#: ../../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>"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1147
-msgid "This link appears to go to"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "This message contains remote images."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
 msgstr ""
 
-#: ../../ui/composer.glade:435
-msgid "To add them as attachments"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:608
-msgid "To:"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:294
-msgid "U_nstar"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:17
-msgid "Unable to login to email server"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
 msgstr ""
 
-#: ../../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"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:701
-#, c-format
-msgid "Unable to open the database for %s"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:713
-#, c-format
-msgid "Unable to rebuild database for \"%s\""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:619
-msgid "Unable to validate:\n"
-msgstr "पुष्टि नहीं हो पाई:\n"
-
-#: ../../ui/composer.glade:127
-msgid "Underline (Ctrl+U)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
 msgstr ""
 
-#: ../../ui/composer.glade:88
-msgid "Unquote text (Ctrl+[)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:65
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
 msgstr ""
 
-#: ../../ui/login.glade:457
-msgid "User_name:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
 msgstr ""
 
-#: ../../ui/password-dialog.glade:70 ../../ui/password-dialog.glade:181
-msgid "Username:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
 msgstr ""
 
-#: ../../src/client/geary-application.vala:19
-msgid "Visit the Yorba web site"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-#, c-format
-msgid "Welcome to Geary."
-msgstr "गीयरी में आपका स्वागत है ।"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:252
-msgid "Work, Home, etc."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
 msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "याहू ! मेल"
-
-#: ../../src/client/util/util-date.vala:177
-msgid "Yesterday"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
 msgstr ""
 
-#: ../../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?"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:551
-msgid "Your settings are insecure"
-msgstr "आपकी सेटिंग असुरक्षित हैं।"
-
-#: ../../src/client/geary-controller.vala:258
-#: ../../src/client/ui/stock.vala:21
-msgid "_About"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
 msgstr ""
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:22
-msgid "_Add"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:47
-msgid "_Archive"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
 msgstr ""
 
-#: ../../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
 msgstr ""
 
-#: ../../ui/composer.glade:525
-msgid "_Attach File"
-msgstr "फ़ाइल संलग्न करें"
-
-#: ../../ui/preferences.glade:69
-msgid "_Automatically select next message"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:19
-msgid "_Cancel"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
 msgstr ""
 
-#: ../../ui/composer.glade:52
-msgid "_Center"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:23
-msgid "_Close"
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:889
-msgid "_Copy"
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:42
-msgid "_Delete"
+#: ../src/client/composer/composer-widget.vala:138
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:548
-msgid "_Details"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:24
-msgid "_Discard"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
 msgstr ""
 
-#: ../../ui/preferences.glade:90
-msgid "_Display conversation preview"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:262
-msgid "_Donate"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
 msgstr ""
 
-#: ../../ui/login.glade:782
-msgid "_Download mail:"
-msgstr "_मेल डाउनलोड करें:"
-
-#: ../../ui/composer.glade:181
-msgid "_Fixed Width"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:328
-#: ../../src/client/views/conversation-viewer.vala:1457
-msgid "_Forward"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:254
-#: ../../src/client/ui/stock.vala:25
-msgid "_Help"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
 msgstr ""
 
-#: ../../ui/composer.glade:542
-msgid "_Include Original Attachments"
-msgstr ""
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" एक फ़ोल्डर है।"
 
-#: ../../src/client/views/conversation-viewer.vala:922
-msgid "_Inspect"
-msgstr ""
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" एक ख़ाली फ़ाइल है।"
 
-#: ../../ui/composer.glade:57
-msgid "_Justify"
-msgstr ""
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "\"%s\" नहीं खोली जा सकी।"
 
-#: ../../src/client/ui/stock.vala:33
-msgid "_Keep"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:305
-msgid "_Label"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
 msgstr ""
 
-#: ../../ui/composer.glade:42
-msgid "_Left"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1469
-msgid "_Mark as Read"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1473
-msgid "_Mark as Unread"
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:271
-msgid "_Mark as..."
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
 msgstr ""
 
-#: ../../ui/composer.glade:157
-msgid "_Medium"
-msgstr ""
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "रंग चुनें"
 
-#: ../../src/client/geary-controller.vala:309
-msgid "_Move"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:18
-msgid "_OK"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:26
-msgid "_Open"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
 msgstr ""
 
-#: ../../ui/login.glade:131 ../../ui/login.glade:539
-#: ../../ui/password-dialog.glade:85
-msgid "_Password:"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
 msgstr ""
 
-#: ../../ui/composer.glade:35
-msgid "_Paste"
-msgstr ""
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/preferences.glade:172
-msgid "_Play notification sounds"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:250
-#: ../../src/client/ui/stock.vala:27
-msgid "_Preferences"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:28
-msgid "_Print..."
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:266
-#: ../../src/client/ui/stock.vala:29
-msgid "_Quit"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:704
-msgid "_Rebuild"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
 msgstr ""
 
-#: ../../ui/composer.glade:14
-msgid "_Redo"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:561
-msgid "_Remember passwords"
-msgstr "_पासवर्ड याद रखें"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr ""
 
-#: ../../src/client/ui/stock.vala:30
+#: ../src/client/components/stock.vala:30
 msgid "_Remove"
 msgstr "हटाएं"
 
-#: ../../src/client/geary-controller.vala:1496
-msgid "_Replace"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:317
-#: ../../src/client/views/conversation-viewer.vala:1447
-msgid "_Reply"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
 msgstr ""
 
-#: ../../ui/composer.glade:141
-msgid "_Rich Text"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
 msgstr ""
 
-#: ../../ui/composer.glade:47
-msgid "_Right"
-msgstr ""
+#~ msgid "%u read messages"
+#~ msgstr "%u पढे हुए संदेश"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:31
-msgid "_Save"
-msgstr ""
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">क्या आप सुनिश्चित हैं कि आप इस खाते को "
+#~ "हटाना चाहते हैं?</span> "
 
-#: ../../src/client/views/conversation-viewer.vala:1395
-msgid "_Save As..."
-msgstr ""
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "इस खाते से संबंधित सभी ईमेल आपके कंप्यूटर से हटा दिये जाएंगे । इससे सर्वर पर "
+#~ "कोई प्रभाव नहीं पड़ेगा।"
 
-#: ../../src/client/views/conversation-viewer.vala:1414
-msgid "_Save Image As..."
-msgstr ""
+#~ msgid "Copyright 2011-2013 Yorba Foundation"
+#~ msgstr "सत्त्वाधिकार 2011-2013 योरबा फ़ाउंडेशन"
 
-#: ../../ui/composer.glade:594
-msgid "_Send"
-msgstr ""
+#~ msgid "Delete conversation (Delete, Backspace, A)"
+#~ msgstr "वार्तालाप को मिटाएं (Delete, Backspace, A)"
 
-#: ../../ui/composer.glade:163
-msgid "_Small"
-msgstr ""
+#~ msgid "Delete conversations (Delete, Backspace, A)"
+#~ msgstr "वार्तालापों को मिटाएं (Delete, Backspace, A)"
 
-#: ../../src/client/geary-controller.vala:289
-msgid "_Star"
-msgstr ""
+#~ msgid "Email address:"
+#~ msgstr "ईमेल एड्रेस:"
 
-#: ../../ui/composer.glade:7
-msgid "_Undo"
-msgstr ""
+#~ msgid "N_ickname:"
+#~ msgstr "उपनाम"
 
-#: ../../ui/login.glade:522
-msgid "_Username:"
-msgstr ""
+#~ msgid "Nickname:"
+#~ msgstr "उपनाम:"
 
-#: ../../src/client/views/conversation-viewer.vala:1494
-msgid "_View Source"
-msgstr ""
+#~ msgid "No authentication re_quired"
+#~ msgstr "प्रमाणीकरण की आवश्यकता नहीं"
 
-#. / 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 ""
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "कृपया प्रतीक्षा करें, गीयरी आपके खाते की पुष्टि कर रहा है."
 
-#: ../../src/client/views/conversation-viewer.vala:1148
-msgid "but actually goes to"
-msgstr ""
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "प्रारूपण हटाएं (Ctrl+Space)"
 
-#: ../../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr ""
+#~ msgid "SSL"
+#~ msgstr "SSL"
 
-#. / Placeholder filename for attachments with no filename.
-#: ../../src/client/views/conversation-viewer.vala:1799
-#: ../../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr ""
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../../src/client/views/conversation-find-bar.vala:226
-msgid "not found"
-msgstr ""
+#~ msgid "Storage"
+#~ msgstr "भंडार"
 
-#. / 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 ""
+#~ msgid "_Attach File"
+#~ msgstr "फ़ाइल संलग्न करें"
+
+#~ msgid "_Download mail:"
+#~ msgstr "_मेल डाउनलोड करें:"
+
+#~ msgid "_Remember passwords"
+#~ msgstr "_पासवर्ड याद रखें"
diff --git a/po/hr.po b/po/hr.po
index 9a3b411..e409139 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -11,532 +11,509 @@ 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-11-02 19:50+0000\n"
-"Last-Translator: MrRajic <mr rajic gmail com>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/geary/language/";
-"hr/)\n"
-"Language: hr\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:04+0000\n"
+"Last-Translator: Marijan Rajic <Unknown>\n"
+"Language-Team: Croatian "
+"(http://www.transifex.com/projects/p/geary/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-
-#: ../../src/client/accounts/add-edit-page.vala:641
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Greška spajanja.\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:55+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: hr\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:624
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "&#8226; Adresa e-pošte je već dodana u Geary.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:628
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; Greška IMAP spajanja.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:631
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; IMAP korisničko ime i lozinka netočni.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:621
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Neispravan nadimak računa.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:634
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; Greška SMTP konekcije.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; SMTP korisničko ime i lozinka netočni.\n"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Dolazna pošta"
 
-#: ../../src/client/accounts/add-edit-page.vala:645
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Korisničko ime i lozinka netočni.\n"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Skice"
 
-#: ../../src/client/views/conversation-viewer.vala:1203
-msgid " (Invalid?)"
-msgstr " (Neispravno?)"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Sent Mail"
 
-#: ../../src/client/composer/composer-window.vala:972
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" je već privijen za slanje."
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Sa zvjezdicom"
 
-#: ../../src/client/composer/composer-window.vala:937
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "Nije moguće pronaći \"%s\"."
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Važno"
 
-#: ../../src/client/composer/composer-window.vala:965
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "Nije moguće pristupiti \"%s\" za čitanje."
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Sva pošta"
 
-#: ../../src/client/composer/composer-window.vala:944
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" je folder."
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Spam"
 
-#: ../../src/client/composer/composer-window.vala:951
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" je prazna datoteka."
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Smeće"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Odlazna pošta"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Pretraga"
 
-#. / 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 %H:%M"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Arhiva"
 
-#. / 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/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Nema"
 
-#. / 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"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr ""
 
-#. / 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 u %H:%M %p"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr ""
 
-#. / 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 "%b %-e"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] "%d poruka"
-msgstr[1] "%d poruke"
-msgstr[2] "%d poruka"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d nova poruka"
-msgstr[1] "%d novih poruka"
-msgstr[2] "%d novih poruka"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:43
-#, c-format
-msgid "%d results"
-msgstr "%d rezultata"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Ostalo"
 
-#. / 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 nepročitana"
-msgstr[1] "%d nepročitane"
-msgstr[2] "%d nepročitanih"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr ""
 
-#: ../../src/client/util/util-date.vala:170
-#, c-format
-msgid "%dh ago"
-msgstr "%dh prije"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr ""
 
-#: ../../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgstr "%dm prije"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:222
-#, c-format
-msgid "%i matches"
-msgstr "%i rezultata"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:224
-#, c-format
-msgid "%i matches (wrapped)"
-msgstr "%i rezultata (označeno)"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr ""
 
-#. / 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 "%H:%M"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr ""
 
-#. / 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"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:107
-#, 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 nova poruka za %s)"
-msgstr[1] ""
-"%s\n"
-"(%d nove poruke za %s)"
-msgstr[2] ""
-"%s\n"
-"(%d ostalih novih poruka za %s)"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr ""
 
-#. / 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)"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(bez naslova)"
 
-#: ../../src/client/views/conversation-web-view.vala:289
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - Inspektor razgovora"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %-e. %b, %Y u %H:%M %p"
 
-#: ../../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Novih poruka"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "Na %1$s, %2$s napisao:"
 
 #. / 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
+#: ../src/engine/rfc822/rfc822-utils.vala:228
 msgid "%s wrote:"
 msgstr "%s napisa:"
 
-#: ../../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 nova poruka sveukupno"
-msgstr[1] "%s, %d nove poruke sveukupno"
-msgstr[2] "%s, %d novih poruka sveukupno"
+#. / 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:234
+msgid "On %s:"
+msgstr "Na %s:"
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Proslijeđena poruka ----------"
 
-#: ../../src/client/views/conversation-viewer.vala:246
-#, c-format
-msgid "%u conversations selected."
-msgstr "%u razgovora odabrano."
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Od: %s\n"
 
-#: ../../src/client/views/conversation-viewer.vala:743
-#, c-format
-msgid "%u read messages"
-msgstr "%u pročitanih poruka"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Naslov: %s\n"
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Datum: %s\n"
 
-#: ../../src/client/util/util-email.vala:30
-msgid "(no subject)"
-msgstr "(bez naslova)"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Za %s\n"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Proslijeđena poruka ----------"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Cc: %s\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:211
-msgid "1 month back"
-msgstr "1 mjesec unatrag"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "nema"
 
-#: ../../src/client/accounts/add-edit-page.vala:214
-msgid "1 year back"
-msgstr "1 godinu unatrag"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Klijent za e-mail"
 
-#: ../../src/client/accounts/add-edit-page.vala:210
-msgid "2 weeks back"
-msgstr "2 tjedna unatrag"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:212
-msgid "3 months back"
-msgstr "3 mjeseca unatrag"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Posjetite web site Yorba"
 
-#: ../../src/client/accounts/add-edit-page.vala:213
-msgid "6 months back"
-msgstr "6 mjeseci unatrag"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
+#: ../src/client/application/geary-controller.vala:62
+msgid "Delete conversation (Shift+Delete)"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Jeste li sigurni da želite ukloniti "
-"ovaj račun?</span> "
 
-#: ../../ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#: ../src/client/application/geary-controller.vala:63
+msgid "Delete conversations (Shift+Delete)"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Nije moguće ukloniti račun</span> "
 
-#: ../../ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr ""
-"Prozor uređivača vezan uz ovaj račun je trenutno otvoren. Spremite ili "
-"otkažite poruku i probajte ponovo."
 
-#: ../../src/client/geary-controller.vala:1491
-#, c-format
-msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr "Datoteka naziva \"%s\" već postoji. Zamijeniti ju novom?"
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:245
-msgid "A_ccounts"
-msgstr "_Računi"
+#: ../src/client/application/geary-controller.vala:72
+msgid "_Archive"
+msgstr "_Arhiv"
 
-#: ../../src/client/geary-controller.vala:1227
-#, c-format
-msgid "About %s"
-msgstr "O %s"
+#: ../src/client/application/geary-controller.vala:73
+msgid "Archive conversation (A)"
+msgstr ""
 
-#: ../../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Računi"
+#: ../src/client/application/geary-controller.vala:74
+msgid "Archive conversations (A)"
+msgstr ""
 
-#: ../../ui/account_list.glade:71
-msgid "Add account"
-msgstr "Dodaj račun"
+#: ../src/client/application/geary-controller.vala:77
+msgid "Mark as S_pam"
+msgstr "Označi kao S_pam"
 
-#: ../../src/client/geary-controller.vala:304
-msgid "Add label"
-msgstr "Dodajte oznaku"
+#: ../src/client/application/geary-controller.vala:78
+msgid "Mark as not S_pam"
+msgstr "Označi da nije S_pam"
+
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
+msgid "Mark conversation"
+msgstr "Obilježavanje razgovora"
+
+#: ../src/client/application/geary-controller.vala:81
+msgid "Mark conversations"
+msgstr "Obilježavanje razgovora"
 
-#: ../../src/client/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Dodavanje oznake razgovoru"
 
-#: ../../src/client/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Dodavanje oznaka razgovoru"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Sva pošta"
-
-#: ../../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 ""
-"Sva pošta vezana uz ovaj račun biti će uklonjena s vašeg računala. Ovo neće "
-"imati uticaja na poštu na serveru."
-
-#: ../../src/client/geary-args.vala:24
-msgid "Allow inspection of WebView"
-msgstr "Dozvoliti inspekciju WebView-a"
-
-#: ../../src/client/views/conversation-viewer.vala:509
-msgid "Always Show From Sender"
-msgstr "Uvijek prikaži pošiljatelja"
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
+msgid "Move conversation"
+msgstr "Premjesti razgovor"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Arhiva"
+#: ../src/client/application/geary-controller.vala:85
+msgid "Move conversations"
+msgstr "Premjesti razgovore"
 
-#: ../../src/client/geary-controller.vala:48
-msgid "Archive conversation (Delete, Backspace, A)"
-msgstr "Arhiviranje razgovora (Delete, Bakspace, A)"
+#: ../src/client/application/geary-controller.vala:372
+msgid "A_ccounts"
+msgstr "_Računi"
 
-#: ../../src/client/geary-controller.vala:49
-msgid "Archive conversations (Delete, Backspace, A)"
-msgstr "Arhiviranje razgovora (Delete, Bakspace, A)"
+#: ../src/client/application/geary-controller.vala:377
+#: ../src/client/components/stock.vala:27
+msgid "_Preferences"
+msgstr "_Postavke"
 
-#: ../../src/client/geary-controller.vala:1477
-#, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr "Jeste li sigurni da želite otvoriti \"%s\"?"
+#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/components/stock.vala:25
+msgid "_Help"
+msgstr "_Pomoć"
 
-#: ../../src/client/geary-controller.vala:1478
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
-msgstr ""
-"Privici  mogu oštetiti vaš sustav ukoliko ih otvorite. Otvorite samo "
-"datoteke od korisnika kojima vjerujete."
+#: ../src/client/application/geary-controller.vala:385
+#: ../src/client/components/stock.vala:21
+msgid "_About"
+msgstr "_O"
 
-#: ../../src/client/views/conversation-viewer.vala:614
-msgid "Bcc:"
-msgstr "Bcc:"
+#: ../src/client/application/geary-controller.vala:389
+#: ../src/client/components/stock.vala:29
+msgid "_Quit"
+msgstr "_Izlaz"
 
-#: ../../ui/composer.glade:113
-msgid "Bold (Ctrl+B)"
-msgstr "Zadebljano (Ctrl+B)"
+#: ../src/client/application/geary-controller.vala:394
+msgid "_Mark as..."
+msgstr "_Označi kao..."
 
-#: ../../ui/composer.glade:69
-msgid "C_olor"
-msgstr "B_oja"
+#: ../src/client/application/geary-controller.vala:400
+msgid "Mark as _Read"
+msgstr "Označi kao _Pročitano"
 
-#: ../../src/client/composer/composer-window.vala:926
-msgid "Cannot add attachment"
-msgstr "Nije moguće dodati privitak"
+#: ../src/client/application/geary-controller.vala:406
+msgid "Mark as _Unread"
+msgstr "Označi kao _Nepročitano"
 
-#: ../../src/client/views/conversation-viewer.vala:611
-msgid "Cc:"
-msgstr "Cc:"
+#: ../src/client/application/geary-controller.vala:412
+msgid "_Star"
+msgstr "_Zvjezdica"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Cc: %s\n"
+#: ../src/client/application/geary-controller.vala:417
+msgid "U_nstar"
+msgstr "Uklo_ni zvjezdicu"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Odaberite datoteku"
+#: ../src/client/application/geary-controller.vala:427
+msgid "Add label"
+msgstr "Dodajte oznaku"
 
-#: ../../src/client/geary-controller.vala:553
-msgid "Co_ntinue"
-msgstr "_Nastavak"
+#: ../src/client/application/geary-controller.vala:428
+msgid "_Label"
+msgstr "_Oznaka"
 
-#: ../../src/client/geary-application.vala:29
-msgid "Compose Message"
-msgstr "Pisanje poruke"
+#: ../src/client/application/geary-controller.vala:432
+msgid "_Move"
+msgstr "_Premjesti"
 
-#: ../../src/client/geary-controller.vala:313
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Sastavi novu poruku (Ctrl+N, N)"
 
-#: ../../ui/preferences.glade:117
-msgid "Composer"
-msgstr "Uređivač"
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
+msgid "_Reply"
+msgstr "_Odgovor"
 
-#: ../../src/client/views/conversation-viewer.vala:897
-msgid "Copy _Email Address"
-msgstr "Kopiranje _e-mail adrese"
+#: ../src/client/application/geary-controller.vala:441
+msgid "Reply (Ctrl+R, R)"
+msgstr "Odgovori (Ctrl+R, R)"
 
-#: ../../src/client/views/conversation-viewer.vala:902
-msgid "Copy _Link"
-msgstr "Kopiranje _linka"
+#: ../src/client/application/geary-controller.vala:445
+msgid "R_eply All"
+msgstr "O_dgovori svima"
 
-#: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr "Copyright 2011-2013 Yorba Foundation"
+#: ../src/client/application/geary-controller.vala:446
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+msgstr "Odgovori svima (Ctrl+Shift+R, Shift+R)"
 
-#: ../../ui/composer.glade:21
-msgid "Cu_t"
-msgstr "Izreži"
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
+msgid "_Forward"
+msgstr "_Naprijed"
 
-#: ../../src/client/views/conversation-viewer.vala:620
-msgid "Date:"
-msgstr "Datum:"
+#: ../src/client/application/geary-controller.vala:452
+msgid "Forward (Ctrl+L, F)"
+msgstr "Proslijedi (Ctrl+L, F)"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "Datum: %s\n"
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:43
-msgid "Delete conversation (Delete, Backspace, A)"
-msgstr "Brisanje razgovora (Delete, Bakspace, A)"
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:44
-msgid "Delete conversations (Delete, Backspace, A)"
-msgstr "Brisanje razgovora (Delete, Bakspace, A)"
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:25
-msgid "Display program version"
-msgstr "Prikaz verzije programa"
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:663
-msgid "Do you want to discard the unsaved message?"
-msgstr "Želite li zaista odbaciti ovu poruku?"
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:666
-msgid "Do you want to discard this message?"
-msgstr "Želite li odbaciti ovu poruku?"
+#: ../src/client/application/geary-controller.vala:746
+msgid "Unable to store server trust exception"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:1479
-msgid "Don't _ask me again"
-msgstr "Ne _pitaj me ponovo"
+#: ../src/client/application/geary-controller.vala:983
+msgid "Your settings are insecure"
+msgstr "Vaše postavke nisu sigurne"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Skice"
+#: ../src/client/application/geary-controller.vala:984
+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 ""
+"Vaše IMAP i/ili SMTP postavke ne koriste SSL ili TLS. To znači da vaše login "
+"ime i lozinka mogu biti pročitani od strane druge osobe na mreži. Jeste li "
+"sigurnu da želite ostaviti takve postavke?"
 
-#: ../../ui/composer.glade:419
-msgid "Drop files here"
-msgstr "Ovdje ispustite datoteke"
+#: ../src/client/application/geary-controller.vala:985
+msgid "Co_ntinue"
+msgstr "_Nastavak"
 
-#: ../../ui/login.glade:115
-msgid "E_mail address:"
-msgstr "Adrese e-pošte:"
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/components/status-bar.vala:29
+msgid "Error sending email"
+msgstr "Greška pri slanju e-pošte"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "E_xit"
-msgstr "I_zlaz"
+#: ../src/client/application/geary-controller.vala:1064
+msgid ""
+"Geary encountered an error sending an email.  If the problem persists, "
+"please manually delete the email from your Outbox folder."
+msgstr ""
+"Geary je naletio na grešku tokom slanja e-pošte. Ukoliko se problem zadrži, "
+"molimo ručno obrišite poruku e-pošte iz vaše mape Izlazna pošta."
 
-#: ../../src/client/views/conversation-viewer.vala:533
-msgid "Edit Draft"
-msgstr "Uredi skicu"
+#: ../src/client/application/geary-controller.vala:1068
+#: ../src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
+msgstr ""
 
-#: ../../ui/account_list.glade:84
-msgid "Edit account"
-msgstr "Uredi račun"
+#: ../src/client/application/geary-controller.vala:1069
+msgid ""
+"Geary encountered an error saving a sent message to Sent Mail.  The message "
+"will stay in your Outbox folder until you delete it."
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:94
-msgid "Email address:"
-msgstr "E-mail adresa:"
+#: ../src/client/application/geary-controller.vala:1138
+msgid "Labels"
+msgstr "Oznake"
 
-#: ../../src/client/geary-application.vala:28
-msgid "Email;E-mail;Mail;"
-msgstr "Epošta;E-pošta;Pošta;"
+#: ../src/client/application/geary-controller.vala:1150
+msgid "Unable to open the database for %s"
+msgstr "Nije moguće otvoriti bazu podataka za %s"
 
-#: ../../ui/preferences.glade:131
-msgid "Enable _spell checking"
-msgstr "Umogući povjeru pravopi_sa"
+#: ../src/client/application/geary-controller.vala:1151
+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 ""
+"Došlo je do greške pri otvaranju lokalne baze podataka za ovaj račun. "
+"Vjerojatno je riječ o korupciji datoteke baze podataka unutar ovog "
+"direktorija:\n"
+"\n"
+"%s\n"
+"\n"
+"Geary može nanovo izgraditi bazu podataka i sinkronizirati je sa serverom na "
+"izlazu.\n"
+"\n"
+"Reizgradnja baze podataka će uništiti sve poruke e-pošte i njihove prilog. "
+"<b>Poruke e-pošte a vašem serveru ostati će netaknute.</b>"
 
-#: ../../ui/login.glade:588
-msgid "Encr_yption:"
-msgstr "E_nkripcija:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "_Rebuild"
+msgstr "_Reizgradi"
 
-#: ../../ui/login.glade:607
-msgid "Encrypt_ion:"
-msgstr "Enkripc_ija:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "E_xit"
+msgstr "I_zlaz"
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-msgid "Enter your account information to get started."
-msgstr "Unesite podatke o vašem računu za početak"
+#: ../src/client/application/geary-controller.vala:1162
+msgid "Unable to rebuild database for \"%s\""
+msgstr "Nije moguće ponovo izgraditi bazu podataka za \"%s\""
 
-#: ../../src/client/geary-controller.vala:714
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -546,1018 +523,1271 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../src/client/composer/composer-window.vala:43
-msgid "Error saving"
-msgstr "Greška pohrane"
-
-#. / 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 "Greška pri slanju e-pošte"
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
+msgid "Unable to open local mailbox for %s"
+msgstr "Nije moguće otvoriti  lokalni račun za %s"
 
-#: ../../src/client/accounts/add-edit-page.vala:216
-msgid "Everything"
-msgstr "Sve"
+#: ../src/client/application/geary-controller.vala:1186
+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 ""
+"Došlo je do greške pri otvaranju lokalne baze podataka za ovaj račun. "
+"Vjerojatno je riječ o problemu sa dozvolama pristupa datoteci.\n"
+"\n"
+"Molimo provjerite da imate čitaj/piši dozvolu nad svim datotekama u ovom "
+"direktoriju:\n"
+"\n"
+"%s"
 
-#: ../../src/client/views/conversation-viewer.vala:1897
-msgid "Failed to open default text editor."
-msgstr "Nije bilo moguće otvoriti podrazumijevani uređivač teksta"
+#: ../src/client/application/geary-controller.vala:1196
+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 ""
+"Broj verzije lokalne baze podataka e-pošte je formatiran za noviju inačicu "
+"Gearyija. Na žalost, bazu podataka nije moguće \"vratiti natrag\" za rad sa "
+"ovom inačicom Gearyija.\n"
+"\n"
+"Molimo instalirajte najnoviju inačicu Gearyija i pokušajte ponovo."
 
-#: ../../src/client/geary-args.vala:54
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Nije bilo moguće izvršiti opcije komandne linije: %s\n"
+#: ../src/client/application/geary-controller.vala:1207
+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 ""
+"Došlo je do greške pri otvaranju lokalnog računa. Ovo je najvjerojatnije do "
+"problema sa vezom.\n"
+"\n"
+"Molimo provjerite svoju mrežnu povezanost i ponovo pokrenite Geary."
 
-#. / 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 "Prvi Zadnji"
+#: ../src/client/application/geary-controller.vala:1715
+msgid "About %s"
+msgstr "O %s"
 
-#: ../../ui/composer.glade:182
-msgid "Fixed Width"
-msgstr "Fiksna širina"
+#. / 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-controller.vala:1718
+msgid "translator-credits"
+msgstr ""
+"translator-credits\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Marijan Rajic https://launchpad.net/~mr-rajic";
 
-#: ../../src/client/geary-controller.vala:329
-msgid "Forward (Ctrl+L, F)"
-msgstr "Proslijedi (Ctrl+L, F)"
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:605
-msgid "From:"
-msgstr "Od:"
+#: ../src/client/application/geary-controller.vala:1986
+msgid "Are you sure you want to open \"%s\"?"
+msgstr "Jeste li sigurni da želite otvoriti \"%s\"?"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "Od: %s\n"
+#: ../src/client/application/geary-controller.vala:1987
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
+"Privici  mogu oštetiti vaš sustav ukoliko ih otvorite. Otvorite samo "
+"datoteke od korisnika kojima vjerujete."
 
-#: ../../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#: ../src/client/application/geary-controller.vala:1988
+msgid "Don't _ask me again"
+msgstr "Ne _pitaj me ponovo"
 
-#: ../../src/client/geary-application.vala:25
-msgid "Geary Mail"
-msgstr "Geary Mail"
+#: ../src/client/application/geary-controller.vala:2006
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr "Datoteka naziva \"%s\" već postoji. Zamijeniti ju novom?"
 
-#: ../../src/client/geary-controller.vala:626
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
-"Geary je naletio na grešku tokom slanja e-pošte. Ukoliko se problem zadrži, "
-"molimo ručno obrišite poruku e-pošte iz vaše mape Izlazna pošta."
+"Ova datoteka već postoji u \"%s\". Zamjenom ćete prepisati njen sadržaj."
 
-#: ../../ui/password-dialog.glade:315
-msgid "General"
-msgstr "Općenito"
+#: ../src/client/application/geary-controller.vala:2011
+msgid "_Replace"
+msgstr "_Zamijeni"
 
-#: ../../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/client/application/geary-controller.vala:2309
+msgid "Close open draft messages?"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:133
-msgid "IMAP Credentials"
-msgstr "IMAP prijava"
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
 
-#: ../../ui/login.glade:572
-msgid "IMAP password"
-msgstr "IMAP zaporka"
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
 
-#: ../../ui/login.glade:286 ../../ui/password-dialog.glade:334
-msgid "IMAP settings"
-msgstr "IMAP postavke"
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
+msgstr ""
 
-#: ../../ui/login.glade:556
-msgid "IMAP username"
-msgstr "IMAP korisničko ime"
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Važno"
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Dolazna pošta"
+#: ../src/client/application/geary-controller.vala:2489
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Sandučići dolazne pošte"
+#: ../src/client/application/geary-controller.vala:2491
+msgid "Delete"
+msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:163
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indeksiranje %s računa"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
+msgstr ""
 
-#: ../../ui/composer.glade:120
-msgid "Italic (Ctrl+I)"
-msgstr "Kurziv (Ctrl+I)"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:689
-msgid "Labels"
-msgstr "Oznake"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr ""
 
-#: ../../ui/composer.glade:151
-msgid "Lar_ge"
-msgstr "Veliko"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Ispis informacije o debugiranju"
 
-#: ../../ui/composer.glade:152
-msgid "Large"
-msgstr "Veliko"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Logiranje nadzora razgovora"
 
-#: ../../ui/composer.glade:62
-msgid "Link (Ctrl+L)"
-msgstr "Link (Ctrl+L)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Bilježi serijalizaciju mreže"
+
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Logiranje mrežne aktivnosti"
 
 #. / 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
+#: ../src/client/application/geary-args.vala:17
 msgid "Log IMAP replay queue"
 msgstr "Logiranje IMAP reda ponavljanja"
 
-#: ../../src/client/geary-args.vala:11
-msgid "Log conversation monitoring"
-msgstr "Logiranje nadzora razgovora"
+#. / 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 "Logiranje mrežne serijalizacije"
+
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Logriranje periodičke aktivnosti"
 
-#: ../../src/client/geary-args.vala:21
+#: ../src/client/application/geary-args.vala:22
 msgid "Log database queries (generates lots of messages)"
 msgstr "Logiranje upita u bazu podataka (generira veliki broj poruka)"
 
 #. / "Normalization" can also be called "synchronization"
-#: ../../src/client/geary-args.vala:23
+#: ../src/client/application/geary-args.vala:24
 msgid "Log folder normalization"
 msgstr "Logiranje normalizacije foldera"
 
-#: ../../src/client/geary-args.vala:13
-msgid "Log network activity"
-msgstr "Logiranje mrežne aktivnosti"
-
-#: ../../src/client/geary-args.vala:12
-msgid "Log network deserialization"
-msgstr "Bilježi serijalizaciju mreže"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Dozvoliti inspekciju WebView-a"
 
-#. / 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 "Logiranje mrežne serijalizacije"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:20
-msgid "Log periodic activity"
-msgstr "Logriranje periodičke aktivnosti"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Prikaz verzije programa"
 
-#: ../../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr ""
 
-#: ../../src/client/geary-application.vala:26
-msgid "Mail Client"
-msgstr "Klijent za e-mail"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Molimo, šaljite vaše komentare, prijedloge i bugove na:"
 
-#: ../../src/client/views/conversation-viewer.vala:1479
-msgid "Mark Unread From _Here"
-msgstr "Obilježi kao nepročitano od _ovdje"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Nije bilo moguće izvršiti opcije komandne linije: %s\n"
 
-#: ../../src/client/geary-controller.vala:52
-msgid "Mark as S_pam"
-msgstr "Označi kao S_pam"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Nepoznata opcija komandne linije \"%s\"\n"
 
-#: ../../src/client/geary-controller.vala:277
-msgid "Mark as _Read"
-msgstr "Označi kao _Pročitano"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Novih poruka"
 
-#: ../../src/client/geary-controller.vala:283
-msgid "Mark as _Unread"
-msgstr "Označi kao _Nepročitano"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d nova poruka"
+msgstr[1] "%d novih poruka"
+msgstr[2] "%d novih poruka"
 
-#: ../../src/client/geary-controller.vala:53
-msgid "Mark as not S_pam"
-msgstr "Označi da nije S_pam"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d nova poruka sveukupno"
+msgstr[1] "%s, %d nove poruke sveukupno"
+msgstr[2] "%s, %d novih poruka sveukupno"
 
-#: ../../src/client/geary-controller.vala:55
-#: ../../src/client/geary-controller.vala:269
-msgid "Mark conversation"
-msgstr "Obilježavanje razgovora"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d nova poruka za %s)"
+msgstr[1] ""
+"%s\n"
+"(%d nove poruke za %s)"
+msgstr[2] ""
+"%s\n"
+"(%d ostalih novih poruka za %s)"
 
-#: ../../src/client/geary-controller.vala:56
-msgid "Mark conversations"
-msgstr "Obilježavanje razgovora"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Otvaranje"
 
-#: ../../src/client/views/formatted-conversation-data.vala:11
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Ja"
 
-#: ../../ui/composer.glade:158
-msgid "Medium"
-msgstr "Srednje"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr ""
 
-#: ../../ui/composer.glade:75
-msgid "More options"
-msgstr "Više opcija"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:59
-#: ../../src/client/geary-controller.vala:308
-msgid "Move conversation"
-msgstr "Premjesti razgovor"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:60
-msgid "Move conversations"
-msgstr "Premjesti razgovore"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
 
-#: ../../ui/login.glade:176
-msgid "N_ame:"
-msgstr "I_me:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr ""
 
-#: ../../ui/login.glade:230
-msgid "N_ickname:"
-msgstr "Nad_imak"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "Nova poruka"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:80
-msgid "Nickname:"
-msgstr "Nadimak:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
 
-#: ../../ui/login.glade:661
-msgid "No authentication re_quired"
-msgstr "Nije potrebna autentifikacija"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:275
-msgid "No conversations in folder."
-msgstr "Nema konverzacija unutar mape."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:244
-msgid "No conversations selected."
-msgstr "Nema odabranih razgovora"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:273
-msgid "No search results found."
-msgstr "Nema rezultata unutar pretrage."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:128
-#: ../../src/engine/api/geary-special-folder-type.vala:58
-msgid "None"
-msgstr "Nema"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr ""
 
-#: ../../ui/preferences.glade:158
-msgid "Notifications"
-msgstr "Napomene"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr ""
+
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr ""
+
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Odaberite datoteku"
+
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Privitak"
+
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr ""
+
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Računi"
+
+#. / 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 "Prvi Zadnji"
 
-#: ../../src/client/util/util-date.vala:164
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Dobrodošli u Geary"
+
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Unesite podatke o vašem računu za početak"
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 tjedna unatrag"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 mjesec unatrag"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 mjeseca unatrag"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 mjeseci unatrag"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 godinu unatrag"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Sve"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "Zapamti zaporke"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "Zapamti zaporku"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Nije moguće odobriti:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Neispravan nadimak računa.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Adresa e-pošte je već dodana u Geary.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Greška IMAP spajanja.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; IMAP korisničko ime i lozinka netočni.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Greška SMTP konekcije.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; SMTP korisničko ime i lozinka netočni.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Greška spajanja.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Korisničko ime i lozinka netočni.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Spremanje"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "Dod_avanje"
+
+#. / 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 "%H:%M"
+
+#. / 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 "%b %-e"
+
+#. / 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 %H:%M"
+
+#. / 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 "Sada"
 
-#. / 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 "Na %1$s, %2$s napisao:"
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#. / 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 "Na %s:"
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Otvaranje"
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Jučer"
 
-#: ../../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Ostalo"
+#. / 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
+msgid "%A"
+msgstr "%A"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Odlazna pošta"
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "bajta"
 
-#: ../../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "TB"
 
-#: ../../src/client/geary-args.vala:10
-msgid "Output debugging information"
-msgstr "Ispis informacije o debugiranju"
+#: ../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"
 
-#: ../../ui/login.glade:337
-msgid "P_ort:"
-msgstr "P_ort:"
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "KB"
 
-#: ../../ui/login.glade:474
-msgid "Pass_word:"
-msgstr "_Lozinka:"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d poruka"
+msgstr[1] "%d poruke"
+msgstr[2] "%d poruka"
 
-#: ../../ui/login.glade:101
-msgid "Password"
-msgstr "Zaporka"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d nepročitana"
+msgstr[1] "%d nepročitane"
+msgstr[2] "%d nepročitanih"
 
-#: ../../ui/password-dialog.glade:196
-msgid "Password:"
-msgstr "Lozinka:"
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../../ui/composer.glade:102
-msgid "Paste _With Formatting"
-msgstr "Zalijepi formatirano"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Sandučići dolazne pošte"
 
-#: ../../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your email password"
-msgstr "Molimo, unesite vašu e-mail lozinku"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Pretraga računa %s"
 
-#: ../../src/client/geary-args.vala:47
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Molimo, šaljite vaše komentare, prijedloge i bugove na:"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
-msgstr "Molimo pričekajte dok Geari odobri Vaš račun"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "Nema odabranih razgovora"
 
-#: ../../ui/login.glade:421
-msgid "Por_t:"
-msgstr "Por_t:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/password-dialog.glade:367 ../../ui/password-dialog.glade:470
-msgid "Port:"
-msgstr "Port:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
+msgstr "Nema rezultata unutar pretrage."
 
-#: ../../ui/composer.glade:81
-msgid "Quote text  (Ctrl+])"
-msgstr "Citiraj tekst (Ctrl+])"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
+msgstr "Nema konverzacija unutar mape."
 
-#: ../../src/client/geary-controller.vala:322
-msgid "R_eply All"
-msgstr "O_dgovori svima"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
+msgstr "Ova poruka sadrži udaljene slike."
 
-#: ../../ui/preferences.glade:55
-msgid "Reading"
-msgstr "Čitanje"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr "Slanje slika"
 
-#: ../../ui/password-dialog.glade:274
-msgid "Real name:"
-msgstr "Stvarno ime:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
+msgstr "Uvijek prikaži pošiljatelja"
 
-#: ../../src/client/accounts/add-edit-page.vala:590
-msgid "Remem_ber password"
-msgstr "Zapamti zaporku"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
+msgstr "Uredi skicu"
 
-#: ../../src/client/accounts/add-edit-page.vala:583
-msgid "Remem_ber passwords"
-msgstr "Zapamti zaporke"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "Od:"
 
-#: ../../ui/account_list.glade:97
-msgid "Remove account"
-msgstr "Ukloni račun"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "Za:"
 
-#: ../../ui/composer.glade:95
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Uklanjanje formata (Ctrl+Space)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Cc:"
 
-#: ../../src/client/geary-controller.vala:318
-msgid "Reply (Ctrl+R, R)"
-msgstr "Odgovori (Ctrl+R, R)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Bcc:"
 
-#: ../../src/client/geary-controller.vala:323
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
-msgstr "Odgovori svima (Ctrl+Shift+R, Shift+R)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "Naslov"
 
-#: ../../src/client/views/conversation-viewer.vala:1452
-msgid "Reply to _All"
-msgstr "Odgovor _svima"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Datum:"
 
-#: ../../ui/password-dialog.glade:163
-msgid "SMTP Credentials"
-msgstr "SMTP prijava"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:507
-msgid "SMTP password"
-msgstr "SMTP zaporka"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "_Kopiranje"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "Kopiranje _e-mail adrese"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "Kopiranje _linka"
 
-#: ../../ui/login.glade:439 ../../ui/password-dialog.glade:437
-msgid "SMTP settings"
-msgstr "SMTP postavke"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
+msgstr "Odaberi _Poruke"
 
-#: ../../ui/login.glade:491
-msgid "SMTP username"
-msgstr "SMTP korisničko ime"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Odaberi _sve"
 
-#: ../../src/client/dialogs/password-dialog.vala:124
-msgid "SSL"
-msgstr "SSL"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "_Pregled"
 
-#: ../../ui/password-dialog.glade:382 ../../ui/password-dialog.glade:485
-msgid "SSL/TLS encryption:"
-msgstr "SSL/TLS enkripcija:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr "Čini se da ova poveznica usmjerava na"
 
-#: ../../src/client/dialogs/password-dialog.vala:126
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
+msgstr "ali u stvari ide na"
 
-#: ../../ui/composer.glade:169
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
+msgstr " (Neispravno?)"
 
-#: ../../ui/composer.glade:175
-msgid "S_erif"
-msgstr "S_erif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
+msgstr "_Pohrani sliku kao..."
 
-#: ../../ui/login.glade:160
-msgid "S_ervice:"
-msgstr "Servis:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_Spremi kao.."
 
-#: ../../ui/composer.glade:170
-msgid "Sans Serif"
-msgstr "Sans Serif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "Spremanje svih privi_taka.."
 
-#: ../../src/client/views/conversation-viewer.vala:1437
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
 msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] "Spremanje svih privi_taka.."
 
-#: ../../src/client/views/conversation-viewer.vala:1400
-msgid "Save All A_ttachments..."
-msgstr "Spremanje svih privi_taka.."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "Odgovor _svima"
 
-#: ../../src/client/composer/composer-window.vala:41
-msgid "Saved"
-msgstr "Pohranjeno"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "_Označi kao pročitano"
 
-#: ../../src/client/composer/composer-window.vala:42
-msgid "Saving"
-msgstr "Pohrana"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "_Označi kao nepročitano"
 
-#: ../../ui/login.glade:304
-msgid "Se_rver:"
-msgstr "Se_rver:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
+msgstr "Obilježi kao nepročitano od _ovdje"
 
-#: ../../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 "Pretraga"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "Izvorni _format"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:39
-#: ../../src/client/ui/main-toolbar.vala:170
-#, c-format
-msgid "Search %s account"
-msgstr "Pretraga računa %s"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "Nije bilo moguće otvoriti podrazumijevani uređivač teksta"
 
-#: ../../src/client/ui/main-toolbar.vala:76
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Pretraži svu poštu unutar računa po ključnim riječima (Ctrl+S)"
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr "%s - Inspektor razgovora"
 
-#: ../../src/client/composer/composer-window.vala:1243
-msgid "Select Color"
-msgstr "Odabir boje"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Pohranjeno"
 
-#: ../../src/client/ui/stock.vala:32
-#: ../../src/client/views/conversation-viewer.vala:916
-msgid "Select _All"
-msgstr "Odaberi _sve"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Pohrana"
 
-#: ../../src/client/views/conversation-viewer.vala:910
-msgid "Select _Message"
-msgstr "Odaberi _Poruke"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Greška pohrane"
 
-#: ../../src/client/geary-application.vala:27
-msgid "Send and receive email"
-msgstr "Primanje i slanje pošte"
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:747
-msgid "Send message with an empty body?"
-msgstr "Pošaljite poruku sa praznim sadržajem?"
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Nova poruka"
+
+#: ../src/client/composer/composer-widget.vala:138
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:743
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Želite li odbaciti ovu poruku?"
+
+#: ../src/client/composer/composer-widget.vala:1262
 msgid "Send message with an empty subject and body?"
 msgstr "Pošaljite poruku sa praznim naslovom i sadržajem?"
 
-#: ../../src/client/composer/composer-window.vala:745
+#: ../src/client/composer/composer-widget.vala:1264
 msgid "Send message with an empty subject?"
 msgstr "Šaljete poruku bez naslova?"
 
-#: ../../src/client/composer/composer-window.vala:749
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Pošaljite poruku sa praznim sadržajem?"
+
+#: ../src/client/composer/composer-widget.vala:1268
 msgid "Send message without an attachment?"
 msgstr "Šaljete poruku bez priloga?"
 
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Nije moguće dodati privitak"
+
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "Nije moguće pronaći \"%s\"."
+
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" je folder."
+
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" je prazna datoteka."
+
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "Nije moguće pristupiti \"%s\" za čitanje."
+
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "\"%s\" je već privijen za slanje."
+
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Odabir boje"
+
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr ""
+
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr ""
+
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../../src/client/ui/status-bar.vala:25
+#: ../src/client/components/status-bar.vala:26
 msgid "Sending..."
 msgstr "Slanje..."
 
-#: ../../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Sent Mail"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:404
-msgid "Ser_ver:"
-msgstr "Ser_ver:"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:176
-msgid "Serif"
-msgstr "Serif"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "nije nađeno"
 
-#: ../../ui/password-dialog.glade:352 ../../ui/password-dialog.glade:455
-msgid "Server:"
-msgstr "Server:"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_OK"
 
-#: ../../ui/password-dialog.glade:259
-msgid "Service:"
-msgstr "Usluga:"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Otkaži"
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "Show Images"
-msgstr "Slanje slika"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Zatvori"
 
-#: ../../ui/preferences.glade:193
-msgid "Show _notifications for new mail"
-msgstr "Prikaz _napomena za novu poštu"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Odbaci"
 
-#: ../../ui/composer.glade:164
-msgid "Small"
-msgstr "Malo"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Otvori"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Spam"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Ispis..."
 
-#: ../../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Sa zvjezdicom"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Uklanjanje"
 
-#: ../../ui/login.glade:761
-msgid "Storage"
-msgstr "Pohrana"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Zadrži"
 
-#: ../../ui/composer.glade:134
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Precrtano (Ctrl+K)"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Pretraži svu poštu unutar računa po ključnim riječima (Ctrl+S)"
 
-#: ../../src/client/views/conversation-viewer.vala:617
-msgid "Subject:"
-msgstr "Naslov"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Indeksiranje %s računa"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Naslov: %s\n"
+#~ msgid "%d results"
+#~ msgstr "%d rezultata"
 
-#: ../../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#~ msgid "%i matches"
+#~ msgstr "%i rezultata"
 
-#: ../../src/client/geary-controller.vala:1493
-#, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr ""
-"Ova datoteka već postoji u \"%s\". Zamjenom ćete prepisati njen sadržaj."
+#~ msgid "%i matches (wrapped)"
+#~ msgstr "%i rezultata (označeno)"
 
-#: ../../src/client/geary-controller.vala:747
-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 ""
-"Broj verzije lokalne baze podataka e-pošte je formatiran za noviju inačicu "
-"Gearyija. Na žalost, bazu podataka nije moguće \"vratiti natrag\" za rad sa "
-"ovom inačicom Gearyija.\n"
-"\n"
-"Molimo instalirajte najnoviju inačicu Gearyija i pokušajte ponovo."
+#~ msgid "%u conversations selected."
+#~ msgstr "%u razgovora odabrano."
 
-#: ../../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 ""
-"Došlo je do greške pri otvaranju lokalnog računa. Ovo je najvjerojatnije do "
-"problema sa vezom.\n"
-"\n"
-"Molimo provjerite svoju mrežnu povezanost i ponovo pokrenite Geary."
+#~ msgid "%u read messages"
+#~ msgstr "%u pročitanih poruka"
 
-#: ../../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 ""
-"Došlo je do greške pri otvaranju lokalne baze podataka za ovaj račun. "
-"Vjerojatno je riječ o problemu sa dozvolama pristupa datoteci.\n"
-"\n"
-"Molimo provjerite da imate čitaj/piši dozvolu nad svim datotekama u ovom "
-"direktoriju:\n"
-"\n"
-"%s"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Jeste li sigurni da želite ukloniti "
+#~ "ovaj račun?</span> "
 
-#: ../../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 ""
-"Došlo je do greške pri otvaranju lokalne baze podataka za ovaj račun. "
-"Vjerojatno je riječ o korupciji datoteke baze podataka unutar ovog "
-"direktorija:\n"
-"\n"
-"%s\n"
-"\n"
-"Geary može nanovo izgraditi bazu podataka i sinkronizirati je sa serverom na "
-"izlazu.\n"
-"\n"
-"Reizgradnja baze podataka će uništiti sve poruke e-pošte i njihove prilog. "
-"<b>Poruke e-pošte a vašem serveru ostati će netaknute.</b>"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Nije moguće ukloniti račun</span> "
 
-#: ../../src/client/views/conversation-viewer.vala:1147
-msgid "This link appears to go to"
-msgstr "Čini se da ova poveznica usmjerava na"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Prozor uređivača vezan uz ovaj račun je trenutno otvoren. Spremite ili "
+#~ "otkažite poruku i probajte ponovo."
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "This message contains remote images."
-msgstr "Ova poruka sadrži udaljene slike."
+#~ msgid "Add account"
+#~ msgstr "Dodaj račun"
 
-#: ../../ui/composer.glade:435
-msgid "To add them as attachments"
-msgstr "Da ih dodijelite privicima"
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Sva pošta vezana uz ovaj račun biti će uklonjena s vašeg računala. Ovo neće "
+#~ "imati uticaja na poštu na serveru."
 
-#: ../../src/client/views/conversation-viewer.vala:608
-msgid "To:"
-msgstr "Za:"
+#~ msgid "Archive conversation (Delete, Backspace, A)"
+#~ msgstr "Arhiviranje razgovora (Delete, Bakspace, A)"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "Za %s\n"
+#~ msgid "Archive conversations (Delete, Backspace, A)"
+#~ msgstr "Arhiviranje razgovora (Delete, Bakspace, A)"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Smeće"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Zadebljano (Ctrl+B)"
 
-#: ../../src/client/geary-controller.vala:294
-msgid "U_nstar"
-msgstr "Uklo_ni zvjezdicu"
+#~ msgid "C_olor"
+#~ msgstr "B_oja"
 
-#: ../../src/client/dialogs/password-dialog.vala:17
-msgid "Unable to login to email server"
-msgstr "Nije se moguće autentificirati na e-mail serveru"
+#~ msgid "Compose Message"
+#~ msgstr "Pisanje poruke"
 
-#: ../../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 "Nije moguće otvoriti  lokalni račun za %s"
+#~ msgid "Composer"
+#~ msgstr "Uređivač"
 
-#: ../../src/client/geary-controller.vala:701
-#, c-format
-msgid "Unable to open the database for %s"
-msgstr "Nije moguće otvoriti bazu podataka za %s"
+#~ msgid "Copyright 2011-2013 Yorba Foundation"
+#~ msgstr "Copyright 2011-2013 Yorba Foundation"
 
-#: ../../src/client/geary-controller.vala:713
-#, c-format
-msgid "Unable to rebuild database for \"%s\""
-msgstr "Nije moguće ponovo izgraditi bazu podataka za \"%s\""
+#~ msgid "Cu_t"
+#~ msgstr "Izreži"
 
-#: ../../src/client/accounts/add-edit-page.vala:619
-msgid "Unable to validate:\n"
-msgstr "Nije moguće odobriti:\n"
+#~ msgid "Delete conversation (Delete, Backspace, A)"
+#~ msgstr "Brisanje razgovora (Delete, Bakspace, A)"
 
-#: ../../ui/composer.glade:127
-msgid "Underline (Ctrl+U)"
-msgstr "Podcrtano (Ctrl+U)"
+#~ msgid "Delete conversations (Delete, Backspace, A)"
+#~ msgstr "Brisanje razgovora (Delete, Bakspace, A)"
 
-#: ../../ui/composer.glade:88
-msgid "Unquote text (Ctrl+[)"
-msgstr "Ukloni citat teksta (Ctrl+[)"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Želite li zaista odbaciti ovu poruku?"
 
-#: ../../src/client/geary-args.vala:65
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Nepoznata opcija komandne linije \"%s\"\n"
+#~ msgid "Drop files here"
+#~ msgstr "Ovdje ispustite datoteke"
 
-#: ../../ui/login.glade:457
-msgid "User_name:"
-msgstr "Korisničko _ime::"
+#~ msgid "E_mail address:"
+#~ msgstr "Adrese e-pošte:"
 
-#: ../../ui/password-dialog.glade:70 ../../ui/password-dialog.glade:181
-msgid "Username:"
-msgstr "Korisničko ime:"
+#~ msgid "Edit account"
+#~ msgstr "Uredi račun"
 
-#: ../../src/client/geary-application.vala:19
-msgid "Visit the Yorba web site"
-msgstr "Posjetite web site Yorba"
+#~ msgid "Email address:"
+#~ msgstr "E-mail adresa:"
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-#, c-format
-msgid "Welcome to Geary."
-msgstr "Dobrodošli u Geary"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Epošta;E-pošta;Pošta;"
 
-#: ../../ui/login.glade:252
-msgid "Work, Home, etc."
-msgstr "Posao, kuća, itd."
+#~ msgid "Enable _spell checking"
+#~ msgstr "Umogući povjeru pravopi_sa"
 
-#: ../../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid "Encr_yption:"
+#~ msgstr "E_nkripcija:"
 
-#: ../../src/client/util/util-date.vala:177
-msgid "Yesterday"
-msgstr "Jučer"
+#~ msgid "Encrypt_ion:"
+#~ msgstr "Enkripc_ija:"
 
-#: ../../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 ""
-"Vaše IMAP i/ili SMTP postavke ne koriste SSL ili TLS. To znači da vaše login "
-"ime i lozinka mogu biti pročitani od strane druge osobe na mreži. Jeste li "
-"sigurnu da želite ostaviti takve postavke?"
+#~ msgid "Fixed Width"
+#~ msgstr "Fiksna širina"
 
-#: ../../src/client/geary-controller.vala:551
-msgid "Your settings are insecure"
-msgstr "Vaše postavke nisu sigurne"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary Mail"
 
-#: ../../src/client/geary-controller.vala:258
-#: ../../src/client/ui/stock.vala:21
-msgid "_About"
-msgstr "_O"
+#~ msgid "General"
+#~ msgstr "Općenito"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:22
-msgid "_Add"
-msgstr "Dod_avanje"
+#~ msgid "IMAP Credentials"
+#~ msgstr "IMAP prijava"
 
-#: ../../src/client/geary-controller.vala:47
-msgid "_Archive"
-msgstr "_Arhiv"
+#~ msgid "IMAP password"
+#~ msgstr "IMAP zaporka"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Privitak"
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP postavke"
 
-#: ../../ui/composer.glade:525
-msgid "_Attach File"
-msgstr "Privijanje _datoteke"
+#~ msgid "IMAP username"
+#~ msgstr "IMAP korisničko ime"
 
-#: ../../ui/preferences.glade:69
-msgid "_Automatically select next message"
-msgstr "_Automatski odabir slijedeće poruke"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Kurziv (Ctrl+I)"
 
-#: ../../src/client/ui/stock.vala:19
-msgid "_Cancel"
-msgstr "_Otkaži"
+#~ msgid "Lar_ge"
+#~ msgstr "Veliko"
 
-#: ../../ui/composer.glade:52
-msgid "_Center"
-msgstr "_Centar"
+#~ msgid "Large"
+#~ msgstr "Veliko"
 
-#: ../../src/client/ui/stock.vala:23
-msgid "_Close"
-msgstr "_Zatvori"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Link (Ctrl+L)"
 
-#: ../../src/client/views/conversation-viewer.vala:889
-msgid "_Copy"
-msgstr "_Kopiranje"
+#~ msgid "Medium"
+#~ msgstr "Srednje"
 
-#: ../../src/client/geary-controller.vala:42
-msgid "_Delete"
-msgstr "_Brisanje"
+#~ msgid "More options"
+#~ msgstr "Više opcija"
 
-#: ../../ui/password-dialog.glade:548
-msgid "_Details"
-msgstr "_Detalji"
+#~ msgid "N_ame:"
+#~ msgstr "I_me:"
 
-#: ../../src/client/ui/stock.vala:24
-msgid "_Discard"
-msgstr "_Odbaci"
+#~ msgid "N_ickname:"
+#~ msgstr "Nad_imak"
 
-#: ../../ui/preferences.glade:90
-msgid "_Display conversation preview"
-msgstr "Prikaži pregled konverzacije"
+#~ msgid "Nickname:"
+#~ msgstr "Nadimak:"
 
-#: ../../src/client/geary-controller.vala:262
-msgid "_Donate"
-msgstr "_Doniraj"
+#~ msgid "No authentication re_quired"
+#~ msgstr "Nije potrebna autentifikacija"
 
-#: ../../ui/login.glade:782
-msgid "_Download mail:"
-msgstr "Preuzimanje pošte:"
+#~ msgid "Notifications"
+#~ msgstr "Napomene"
 
-#: ../../ui/composer.glade:181
-msgid "_Fixed Width"
-msgstr "Fiksna širina"
+#~ msgid "P_ort:"
+#~ msgstr "P_ort:"
 
-#: ../../src/client/geary-controller.vala:328
-#: ../../src/client/views/conversation-viewer.vala:1457
-msgid "_Forward"
-msgstr "_Naprijed"
+#~ msgid "Pass_word:"
+#~ msgstr "_Lozinka:"
 
-#: ../../src/client/geary-controller.vala:254
-#: ../../src/client/ui/stock.vala:25
-msgid "_Help"
-msgstr "_Pomoć"
+#~ msgid "Password"
+#~ msgstr "Zaporka"
 
-#: ../../ui/composer.glade:542
-msgid "_Include Original Attachments"
-msgstr "Uključi originalne priloge"
+#~ msgid "Password:"
+#~ msgstr "Lozinka:"
 
-#: ../../src/client/views/conversation-viewer.vala:922
-msgid "_Inspect"
-msgstr "_Pregled"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Zalijepi formatirano"
 
-#: ../../ui/composer.glade:57
-msgid "_Justify"
-msgstr "_Poravnanje"
+#~ msgid "Please enter your email password"
+#~ msgstr "Molimo, unesite vašu e-mail lozinku"
 
-#: ../../src/client/ui/stock.vala:33
-msgid "_Keep"
-msgstr "_Zadrži"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Molimo pričekajte dok Geari odobri Vaš račun"
 
-#: ../../src/client/geary-controller.vala:305
-msgid "_Label"
-msgstr "_Oznaka"
+#~ msgid "Por_t:"
+#~ msgstr "Por_t:"
 
-#: ../../ui/composer.glade:42
-msgid "_Left"
-msgstr "_Lijevo"
+#~ msgid "Port:"
+#~ msgstr "Port:"
 
-#: ../../src/client/views/conversation-viewer.vala:1469
-msgid "_Mark as Read"
-msgstr "_Označi kao pročitano"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Citiraj tekst (Ctrl+])"
 
-#: ../../src/client/views/conversation-viewer.vala:1473
-msgid "_Mark as Unread"
-msgstr "_Označi kao nepročitano"
+#~ msgid "Reading"
+#~ msgstr "Čitanje"
 
-#: ../../src/client/geary-controller.vala:271
-msgid "_Mark as..."
-msgstr "_Označi kao..."
+#~ msgid "Real name:"
+#~ msgstr "Stvarno ime:"
 
-#: ../../ui/composer.glade:157
-msgid "_Medium"
-msgstr "Srednje"
+#~ msgid "Remove account"
+#~ msgstr "Ukloni račun"
 
-#: ../../src/client/geary-controller.vala:309
-msgid "_Move"
-msgstr "_Premjesti"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Uklanjanje formata (Ctrl+Space)"
 
-#: ../../src/client/ui/stock.vala:18
-msgid "_OK"
-msgstr "_OK"
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP prijava"
 
-#: ../../src/client/ui/stock.vala:26
-msgid "_Open"
-msgstr "_Otvori"
+#~ msgid "SMTP password"
+#~ msgstr "SMTP zaporka"
 
-#: ../../ui/login.glade:131 ../../ui/login.glade:539
-#: ../../ui/password-dialog.glade:85
-msgid "_Password:"
-msgstr "_Lozinka:"
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP postavke"
 
-#: ../../ui/composer.glade:35
-msgid "_Paste"
-msgstr "Zalijepi"
+#~ msgid "SMTP username"
+#~ msgstr "SMTP korisničko ime"
 
-#: ../../ui/preferences.glade:172
-msgid "_Play notification sounds"
-msgstr "_Zvuk napomena"
+#~ msgid "SSL"
+#~ msgstr "SSL"
 
-#: ../../src/client/geary-controller.vala:250
-#: ../../src/client/ui/stock.vala:27
-msgid "_Preferences"
-msgstr "_Postavke"
+#~ msgid "SSL/TLS encryption:"
+#~ msgstr "SSL/TLS enkripcija:"
 
-#: ../../src/client/ui/stock.vala:28
-msgid "_Print..."
-msgstr "_Ispis..."
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../../src/client/geary-controller.vala:266
-#: ../../src/client/ui/stock.vala:29
-msgid "_Quit"
-msgstr "_Izlaz"
+#~ msgid "S_ans Serif"
+#~ msgstr "S_ans Serif"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "_Rebuild"
-msgstr "_Reizgradi"
+#~ msgid "S_erif"
+#~ msgstr "S_erif"
 
-#: ../../ui/composer.glade:14
-msgid "_Redo"
-msgstr "_Ponovi"
+#~ msgid "S_ervice:"
+#~ msgstr "Servis:"
 
-#: ../../ui/password-dialog.glade:561
-msgid "_Remember passwords"
-msgstr "Poh_rani lozinke:"
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../../src/client/ui/stock.vala:30
-msgid "_Remove"
-msgstr "_Uklanjanje"
+#~ msgid "Se_rver:"
+#~ msgstr "Se_rver:"
 
-#: ../../src/client/geary-controller.vala:1496
-msgid "_Replace"
-msgstr "_Zamijeni"
+#~ msgid "Send and receive email"
+#~ msgstr "Primanje i slanje pošte"
 
-#: ../../src/client/geary-controller.vala:317
-#: ../../src/client/views/conversation-viewer.vala:1447
-msgid "_Reply"
-msgstr "_Odgovor"
+#~ msgid "Ser_ver:"
+#~ msgstr "Ser_ver:"
 
-#: ../../ui/composer.glade:141
-msgid "_Rich Text"
-msgstr "Bogati tekst"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../../ui/composer.glade:47
-msgid "_Right"
-msgstr "_Desno"
+#~ msgid "Server:"
+#~ msgstr "Server:"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:31
-msgid "_Save"
-msgstr "_Spremanje"
+#~ msgid "Service:"
+#~ msgstr "Usluga:"
 
-#: ../../src/client/views/conversation-viewer.vala:1395
-msgid "_Save As..."
-msgstr "_Spremi kao.."
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Prikaz _napomena za novu poštu"
 
-#: ../../src/client/views/conversation-viewer.vala:1414
-msgid "_Save Image As..."
-msgstr "_Pohrani sliku kao..."
+#~ msgid "Small"
+#~ msgstr "Malo"
 
-#: ../../ui/composer.glade:594
-msgid "_Send"
-msgstr "_Slanje"
+#~ msgid "Storage"
+#~ msgstr "Pohrana"
 
-#: ../../ui/composer.glade:163
-msgid "_Small"
-msgstr "Malo"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Precrtano (Ctrl+K)"
 
-#: ../../src/client/geary-controller.vala:289
-msgid "_Star"
-msgstr "_Zvjezdica"
+#~ msgid "To add them as attachments"
+#~ msgstr "Da ih dodijelite privicima"
 
-#: ../../ui/composer.glade:7
-msgid "_Undo"
-msgstr "_Poništi"
+#~ msgid "Unable to login to email server"
+#~ msgstr "Nije se moguće autentificirati na e-mail serveru"
 
-#: ../../ui/login.glade:522
-msgid "_Username:"
-msgstr "_Korisničko ime:"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Podcrtano (Ctrl+U)"
 
-#: ../../src/client/views/conversation-viewer.vala:1494
-msgid "_View Source"
-msgstr "Izvorni _format"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Ukloni citat teksta (Ctrl+[)"
 
-#. / 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 "priloži|uloži|uloženo|naslovi pismo"
+#~ msgid "User_name:"
+#~ msgstr "Korisničko _ime::"
 
-#: ../../src/client/views/conversation-viewer.vala:1148
-msgid "but actually goes to"
-msgstr "ali u stvari ide na"
+#~ msgid "Username:"
+#~ msgstr "Korisničko ime:"
 
-#: ../../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "bajta"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Posao, kuća, itd."
 
-#. / Placeholder filename for attachments with no filename.
-#: ../../src/client/views/conversation-viewer.vala:1799
-#: ../../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "nema"
+#~ msgid "_Attach File"
+#~ msgstr "Privijanje _datoteke"
 
-#: ../../src/client/views/conversation-find-bar.vala:226
-msgid "not found"
-msgstr "nije nađeno"
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Automatski odabir slijedeće poruke"
 
-#. / 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 "_Center"
+#~ msgstr "_Centar"
+
+#~ msgid "_Delete"
+#~ msgstr "_Brisanje"
+
+#~ msgid "_Details"
+#~ msgstr "_Detalji"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "Prikaži pregled konverzacije"
+
+#~ msgid "_Donate"
+#~ msgstr "_Doniraj"
+
+#~ msgid "_Download mail:"
+#~ msgstr "Preuzimanje pošte:"
+
+#~ msgid "_Fixed Width"
+#~ msgstr "Fiksna širina"
+
+#~ msgid "_Include Original Attachments"
+#~ msgstr "Uključi originalne priloge"
+
+#~ msgid "_Justify"
+#~ msgstr "_Poravnanje"
+
+#~ msgid "_Left"
+#~ msgstr "_Lijevo"
+
+#~ msgid "_Medium"
+#~ msgstr "Srednje"
+
+#~ msgid "_Password:"
+#~ msgstr "_Lozinka:"
+
+#~ msgid "_Paste"
+#~ msgstr "Zalijepi"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Zvuk napomena"
+
+#~ msgid "_Redo"
+#~ msgstr "_Ponovi"
+
+#~ msgid "_Remember passwords"
+#~ msgstr "Poh_rani lozinke:"
+
+#~ msgid "_Rich Text"
+#~ msgstr "Bogati tekst"
+
+#~ msgid "_Right"
+#~ msgstr "_Desno"
+
+#~ msgid "_Send"
+#~ msgstr "_Slanje"
+
+#~ msgid "_Small"
+#~ msgstr "Malo"
+
+#~ msgid "_Undo"
+#~ msgstr "_Poništi"
+
+#~ msgid "_Username:"
+#~ msgstr "_Korisničko ime:"
+
+#~ msgid "attach|enclosed|enclosing|cover letter"
+#~ msgstr "priloži|uloži|uloženo|naslovi pismo"
diff --git a/po/hu.po b/po/hu.po
index b868d80..021ced4 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,456 +9,427 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-06-22 17:11+0000\n"
-"PO-Revision-Date: 2015-06-23 00:19+0200\n"
-"Last-Translator: Balázs Úr <urbalazs gmail com>\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:04+0000\n"
+"Last-Translator: Úr Balázs <urbalazs gmail com>\n"
 "Language-Team: Hungarian <openscope at googlegroups dot com>\n"
-"Language: hu_HU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"geary/language/hu_HU/)\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.2\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Levelezőkliens"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary levelező"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "E-mailek küldése és fogadása"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Levél;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Levél írása"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Elküldés levélben"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Fájlok küldése a Geary használatával"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Mentés"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:54+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: hu_HU\n"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Hozzáadás"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Piszkozatok | Piszkozat"
 
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "További címek a következőhöz: %s"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr "Elküldött | Elküldött levelek | Elküldött üzenetek"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Fiókok"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr "Szemét | Spam | Levélszemét"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Last First"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Kuka | Szemét"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Welcome to Geary."
-msgstr "Üdvözli a Geary!"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr "Archívum | Archívumok | Archiváltak"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Enter your account information to get started."
-msgstr "Adja meg a fiókinformációit a kezdéshez."
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Beérkezett üzenetek"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "2 weeks back"
-msgstr "2 hétre visszamenőleg"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Piszkozatok"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "1 month back"
-msgstr "1 hónapra visszamenőleg"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Elküldött levelek"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "3 months back"
-msgstr "3 hónapra visszamenőleg"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Csillagozott"
 
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "6 months back"
-msgstr "6 hónapra visszamenőleg"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Fontos"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "1 year back"
-msgstr "1 évre visszamenőleg"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Minden levél"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-msgid "2 years back"
-msgstr "2 évre visszamenőleg"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Levélszemét"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-msgid "4 years back"
-msgstr "4 évre visszamenőleg"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Kuka"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "Everything"
-msgstr "Minden"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Postázandó"
 
-#: ../src/client/accounts/add-edit-page.vala:280
-msgid "Edit"
-msgstr "Szerkesztés"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Keresés"
 
-#: ../src/client/accounts/add-edit-page.vala:282
-msgid "Preview"
-msgstr "Előnézet"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Archívum"
 
-#: ../src/client/accounts/add-edit-page.vala:723
-msgid "Remem_ber passwords"
-msgstr "_Jelszavak megjegyzése"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Nincs"
 
-#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "_Jelszó megjegyzése"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:764
-msgid "Unable to validate:\n"
-msgstr "Nem sikerült érvényesíteni:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:766
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Érvénytelen fiók becenév.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:769
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr ""
-"        &#8226; Az e-mail cím már hozzá lett adva a Geary programhoz.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:773
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP kapcsolódási hiba.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:776
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; Az IMAP felhasználónév vagy jelszó helytelen.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Egyéb"
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP kapcsolódási hiba.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "melléklet"
 
-#: ../src/client/accounts/add-edit-page.vala:782
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; Az SMTP felhasználónév vagy jelszó helytelen.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "titkos másolat"
 
-#: ../src/client/accounts/add-edit-page.vala:786
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Kapcsolódási hiba.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "törzs"
 
-#: ../src/client/accounts/add-edit-page.vala:790
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; A felhasználónév vagy jelszó helytelen.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "másolat"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011-2015 Yorba Foundation"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "feladó"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Keresse fel a Yorba weboldalát"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "tárgy"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "A Geary indítása rejtett főablakkal"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "címzett"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Hibakeresési információk kiírása"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "én"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Beszélgetésfigyelés naplózása"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(nincs tárgy)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Hálózati visszafejtés naplózása"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%Y. %b. %-e., %a %-k.%M-kor"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Hálózati tevékenység naplózása"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "%1$s-kor, %2$s írta:"
 
-#. / 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 "IMAP eseménysor naplózása"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s írta:"
 
-#. / 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 "Hálózati sorosítás naplózása"
+#. / 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:234
+msgid "On %s:"
+msgstr "Ekkor: %s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Időszakos tevékenység naplózása"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Továbbított levél -----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Adatbázis lekérdezések naplózása (sok üzenetet állít elő)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Feladó: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Mappa-normalizálás naplózása"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Tárgy: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "A webes nézet megfigyelésének engedélyezése"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Dátum: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Minden kiszolgáló tanúsítvány visszavonása TLS figyelmeztetésekkel"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Címzett: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "A program verziójának megjelenítése"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Másolat: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "%s használata egy új levélíró ablak megnyitásához"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "nincs"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Kérjük írja le véleményét, észrevételeit és a hibákat ide:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Levelezőkliens"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "A parancssori kapcsolók feldolgozása meghiúsult: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "Copyright 2011-2015 Yorba Foundation"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Ismeretlen parancssori kapcsoló: „%s”\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Keresse fel a Yorba weboldalát"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:61
 msgid "Delete conversation"
 msgstr "Beszélgetés törlése"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Beszélgetés törlése (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Beszélgetések törlése (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:67
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Beszélgetés áthelyezése a kukába (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:68
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "Beszélgetések áthelyezése a kukába (Delete, Backspace)"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Archiválás"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Beszélgetés archiválása (A)"
 
-#: ../src/client/application/geary-controller.vala:75
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Beszélgetések archiválása (A)"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Megjelölés levél_szemétként"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Megjelölés nem levél_szemétként"
 
-#: ../src/client/application/geary-controller.vala:81
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Beszélgetés megjelölése"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Beszélgetések megjelölése"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Címke hozzáadása a beszélgetéshez"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Címke hozzáadása a beszélgetésekhez"
 
-#: ../src/client/application/geary-controller.vala:85
-#: ../src/client/application/geary-controller.vala:436
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Beszélgetés áthelyezése"
 
-#: ../src/client/application/geary-controller.vala:86
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Beszélgetések áthelyezése"
 
-#: ../src/client/application/geary-controller.vala:373
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "F_iókok"
 
-#: ../src/client/application/geary-controller.vala:378
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Beállítások"
 
-#: ../src/client/application/geary-controller.vala:382
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Súgó"
 
-#: ../src/client/application/geary-controller.vala:386
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Névjegy"
 
-#: ../src/client/application/geary-controller.vala:390
-msgid "_Donate"
-msgstr "_Adományozás"
-
-#: ../src/client/application/geary-controller.vala:394
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Kilépés"
 
-#: ../src/client/application/geary-controller.vala:399
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Megjelölés mint…"
 
-#: ../src/client/application/geary-controller.vala:405
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Megjelölés _olvasottként"
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Megjelölés ol_vasatlanként"
 
-#: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Csillagozás"
 
-#: ../src/client/application/geary-controller.vala:422
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "C_sillagozás megszüntetése"
 
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Címke hozzáadása"
 
-#: ../src/client/application/geary-controller.vala:433
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Címke"
 
-#: ../src/client/application/geary-controller.vala:437
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "Át_helyezés"
 
-#: ../src/client/application/geary-controller.vala:441
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Új levél írása (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:445
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Válasz"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Válasz (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:450
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "Válasz _mindenkinek"
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Válasz mindenkinek (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "T_ovábbítás"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Továbbítás (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:496
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr "Ürítés"
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr "Levélszemét vagy kuka mappák ürítése"
 
-#: ../src/client/application/geary-controller.vala:501
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr "_Levélszemét ürítése…"
 
-#: ../src/client/application/geary-controller.vala:505
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr "_Kuka ürítése…"
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:538
+#: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
 msgstr "Keresősáv ki- vagy bekapcsolása"
 
-#: ../src/client/application/geary-controller.vala:752
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Nem lehet eltárolni a kiszolgáló megbízhatósági kivételét"
 
-#: ../src/client/application/geary-controller.vala:989
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "A beállításai nem biztonságosak"
 
-#: ../src/client/application/geary-controller.vala:990
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -468,17 +439,17 @@ msgstr ""
 "Ez azt jelenti, hogy a felhasználónevét és a jelszavát mások elolvashatják a "
 "hálózaton. Biztos benne, hogy ezt szeretné tenni?"
 
-#: ../src/client/application/geary-controller.vala:991
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "Fo_lytatás"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Hiba a levél küldésekor"
 
-#: ../src/client/application/geary-controller.vala:1070
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -486,14 +457,12 @@ msgstr ""
 "A Geary hibára futott a levél küldésekor. Ha a probléma állandó, törölje "
 "kézzel a levelet a Kimenő levelek mappájából."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Hiba az elküldött levél mentésekor"
 
-#: ../src/client/application/geary-controller.vala:1075
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -502,20 +471,15 @@ msgstr ""
 "mappába. Az üzenet a Kimenő levelek mappájában fog maradni, amíg ki nem "
 "törli azt."
 
-#: ../src/client/application/geary-controller.vala:1144
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Címkék"
 
-#. 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:1156
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Nem sikerült megnyitni az adatbázist ehhez: %s"
 
-#: ../src/client/application/geary-controller.vala:1157
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -538,21 +502,19 @@ msgstr ""
 "Az adatbázis újjáépítése törölni fogja az összes helyi levelet és azok "
 "mellékleteit. <b>A kiszolgálón lévő levelek nem érintettek.</b>"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "Ú_jjáépítés"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "_Kilépés"
 
-#: ../src/client/application/geary-controller.vala:1168
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Nem sikerült újjáépíteni az adatbázist ehhez: „%s”"
 
-#: ../src/client/application/geary-controller.vala:1169
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -562,17 +524,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1191
-#: ../src/client/application/geary-controller.vala:1201
-#: ../src/client/application/geary-controller.vala:1212
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Nem sikerült megnyitni a helyi postafiókot ehhez: %s"
 
-#: ../src/client/application/geary-controller.vala:1192
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -590,7 +548,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1202
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -604,7 +562,7 @@ msgstr ""
 "\n"
 "Telepítse a Geary legújabb verzióját és próbálja újra."
 
-#: ../src/client/application/geary-controller.vala:1213
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -616,30 +574,31 @@ msgstr ""
 "\n"
 "Ellenőrizze a hálózati kapcsolatot és indítsa újra a Geary programot."
 
-#: ../src/client/application/geary-controller.vala:1721
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "%s névjegye"
 
 #. / 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-controller.vala:1724
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
 msgstr ""
 "Kelemen Gábor <kelemeng at gnome dot hu>\n"
 "Lukács Bence <lukacs.bence1 at gmail dot com>\n"
-"Úr Balázs <urbalazs at gmail dot com>"
+"Úr Balázs <urbalazs at gmail dot com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Úr Balázs https://launchpad.net/~urbalazs";
 
-#: ../src/client/application/geary-controller.vala:1990
+#: ../src/client/application/geary-controller.vala:1976
 msgid "Undo move (Ctrl+Z)"
 msgstr "Áthelyezés visszavonása (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2000
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Biztosan meg szeretné nyitni: „%s”?"
 
-#: ../src/client/application/geary-controller.vala:2001
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -647,307 +606,533 @@ msgstr ""
 "A mellékletek kárt okozhatnak a rendszerében, ha meg vannak nyitva. Csak "
 "megbízható forrásokból nyisson meg fájlokat."
 
-#: ../src/client/application/geary-controller.vala:2002
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Ne _kérdezze újra"
 
-#: ../src/client/application/geary-controller.vala:2020
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "A(z) „%s” nevű fájl már létezik. Le akarja cserélni?"
 
-#: ../src/client/application/geary-controller.vala:2022
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "A fájl már létezik a(z) „%s” helyen. Lecserélésével a tartalma felül lesz "
 "írva."
 
-#: ../src/client/application/geary-controller.vala:2025
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Csere"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2323
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Bezárja a megnyitott piszkozat leveleket?"
 
-#: ../src/client/application/geary-controller.vala:2453
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr "Minden levelet kiürít a(z) %s mappából?"
 
-#: ../src/client/application/geary-controller.vala:2454
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr ""
 "Ez eltávolítja a levelet a Geary programból és a levelezőkiszolgálóról."
 
-#: ../src/client/application/geary-controller.vala:2455
+#: ../src/client/application/geary-controller.vala:2441
 msgid "This cannot be undone."
 msgstr "Ez nem vonható vissza."
 
-#: ../src/client/application/geary-controller.vala:2456
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr "%s ürítése"
 
-#: ../src/client/application/geary-controller.vala:2473
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 msgid "Error emptying %s"
 msgstr "Hiba a(z) %s ürítésekor"
 
-#: ../src/client/application/geary-controller.vala:2503
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Véglegesen törölni szeretné ezt a levelet?"
 msgstr[1] "Véglegesen törölni szeretné ezeket a leveleket?"
 
-#: ../src/client/application/geary-controller.vala:2505
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Törlés"
 
-#: ../src/client/application/geary-controller.vala:2536
+#: ../src/client/application/geary-controller.vala:2522
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Archiválás visszavonása (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2551
+#: ../src/client/application/geary-controller.vala:2537
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Kukába helyezés visszavonása (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2604
+#: ../src/client/application/geary-controller.vala:2590
 msgid "Undo (Ctrl+Z)"
 msgstr "Visszavonás (Ctrl+Z)"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i találat"
-msgstr[1] "%i találat"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "A Geary indítása rejtett főablakkal"
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i találat (körbeért)"
-msgstr[1] "%i találat (körbeért)"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Hibakeresési információk kiírása"
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "nincs találat"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Beszélgetésfigyelés naplózása"
 
-#: ../src/client/components/main-window.vala:430
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Hálózati visszafejtés naplózása"
 
-#: ../src/client/components/search-bar.vala:10
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Keresés"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Hálózati tevékenység naplózása"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:25
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "A fiók minden levélének keresése kulcsszavakra (Ctrl+S)"
+#. / 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 "IMAP eseménysor naplózása"
 
-#: ../src/client/components/search-bar.vala:118
-#, c-format
-msgid "Indexing %s account"
-msgstr "%s fiók indexelése"
+#. / 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 "Hálózati sorosítás naplózása"
 
-#: ../src/client/components/search-bar.vala:129
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "%s fiók keresése"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Időszakos tevékenység naplózása"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Küldés…"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Adatbázis lekérdezések naplózása (sok üzenetet állít elő)"
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_OK"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Mappa-normalizálás naplózása"
 
-#: ../src/client/components/stock.vala:19
-#: ../ui/edit_alternate_emails.glade.h:3 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "Mé_gse"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "A webes nézet megfigyelésének engedélyezése"
 
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Bezárás"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Minden kiszolgáló tanúsítvány visszavonása TLS figyelmeztetésekkel"
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "El_dobás"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "A program verziójának megjelenítése"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Megnyitás"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "%s használata egy új levélíró ablak megnyitásához"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Nyomtatás…"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Kérjük írja le véleményét, észrevételeit és a hibákat ide:"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Eltávolítás"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "A parancssori kapcsolók feldolgozása meghiúsult: %s\n"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "Ö_sszes kijelölése"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Ismeretlen parancssori kapcsoló: „%s”\n"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Megtartás"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Új levelek"
 
-#: ../src/client/composer/composer-widget.vala:73
-msgid "Saved"
-msgstr "Elmentve"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d új levél"
+msgstr[1] "%d új levél"
 
-#: ../src/client/composer/composer-widget.vala:74
-msgid "Saving"
-msgstr "Mentés"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, összesen %d új levél"
+msgstr[1] "%s, összesen %d új levél"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "Error saving"
-msgstr "Hiba a mentéskor"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(további %d új levél ehhez: %s)"
+msgstr[1] ""
+"%s\n"
+"(további %d új levél ehhez: %s)"
 
-#: ../src/client/composer/composer-widget.vala:76
-msgid "Press Backspace to delete quote"
-msgstr "Nyomja meg a Backspace billentyűt az idézet törléséhez"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Megnyitás"
 
-#: ../src/client/composer/composer-widget.vala:77
-msgid "New Message"
-msgstr "Új levél"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Én"
 
-#. A 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:138
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr "Nem megbízható kapcsolat: %s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
+"A(z) %s levelező kiszolgáló személyazonossága a(z) %s:%u címen nem "
+"ellenőrizhető."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
 msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures|CV|cover|letter|csatol|csatolás|"
-"csatolást|csatolásokat|csatolmány|csatolmányt|csatolmányok|csatolmányokat|"
-"csatolva|csatolom|csatoltam|mellékel|melléklet|mellékletet|mellékletek|"
-"mellékleteket|mellékelve|mellékelem|mellékeltem|küldöm|elküldöm|átküldöm|"
-"postázom|fájl|fájlt|fájlok|fájlokat|állomány|állományt|állományok|"
-"állományokat|életrajz|életrajzot|életrajzom|életrajzomat|önéletrajz|"
-"önéletrajzot|önéletrajzom|önéletrajzomat|.doc|.docx|.pdf|.xls|.xlsx|.ppt|."
-"pptx|.rtf|.pps|.odt|.ods|.odp|.odg|.odb"
+"A „Megbízom a kiszolgálóban” és a „Mindig megbízom a kiszolgálóban” "
+"választása a felhasználónév és jelszó nem biztonságos átvitelét okozhatja."
 
-#: ../src/client/composer/composer-widget.vala:1102
-#: ../src/client/composer/composer-widget.vala:1106
-msgid "Do you want to discard this message?"
-msgstr "El szeretné dobni ezt a levelet?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"A „Nem bízom meg a kiszolgálóban” választása azt fogja okozni, hogy a Geary "
+"nem férhet hozzá ehhez a kiszolgálóhoz."
 
-#: ../src/client/composer/composer-widget.vala:1262
-msgid "Send message with an empty subject and body?"
-msgstr "Elküldi a levelet üres tárggyal és törzzsel?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "A Geary nem fogja hozzáadni vagy frissíteni ezt az e-mail fiókot."
 
-#: ../src/client/composer/composer-widget.vala:1264
-msgid "Send message with an empty subject?"
-msgstr "Elküldi a levelet üres tárggyal?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"A „Nem bízom meg a kiszolgálóban” választása azt fogja okozni, hogy a Geary "
+"leállítja a hozzáférést ehhez a fiókhoz."
 
-#: ../src/client/composer/composer-widget.vala:1266
-msgid "Send message with an empty body?"
-msgstr "Elküldi a levelet üres törzzsel?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr "A Geary ki fog lépni, ha nincs más megnyitott e-mail fiókja."
 
-#: ../src/client/composer/composer-widget.vala:1268
-msgid "Send message without an attachment?"
-msgstr "Elküldi a levelet melléklet nélkül?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Lépjen kapcsolatba a rendszergazdával vagy az e-mail szolgáltatójával, ha "
+"bármilyen kérdése van ezzel a hibával kapcsolatban."
 
-#: ../src/client/composer/composer-widget.vala:1530
-msgid "Cannot add attachment"
-msgstr "Nem sikerült mellékletet hozzáadni"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
+"A kiszolgáló tanúsítványát nem ismert hitelesítésszolgáltató írta alá"
 
-#: ../src/client/composer/composer-widget.vala:1541
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "„%s” nem található."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr ""
+"A kiszolgáló személyazonossága nem egyezik a tanúsítványban lévő "
+"személyazonossággal"
 
-#: ../src/client/composer/composer-widget.vala:1548
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "„%s” egy mappa."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "A kiszolgáló tanúsítványa lejárt"
 
-#: ../src/client/composer/composer-widget.vala:1555
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "„%s” egy üres fájl."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "A kiszolgáló tanúsítványát még nem aktiválták"
 
-#: ../src/client/composer/composer-widget.vala:1569
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "„%s” nem nyitható meg olvasásra."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "A kiszolgáló tanúsítványát visszavonták és most érvénytelen"
 
-#: ../src/client/composer/composer-widget.vala:1576
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "„%s” már csatolva van a küldeményhez."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "A kiszolgáló tanúsítványa nem tekinthető biztonságosnak"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1585
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr "Hiba történt a kiszolgáló tanúsítványának feldolgozása során"
 
-#: ../src/client/composer/composer-widget.vala:1645
-msgid "To: "
-msgstr "Címzett: "
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr "A Geary az e-mail jelszavát igényli a folytatáshoz"
 
-#: ../src/client/composer/composer-widget.vala:1648
-msgid "Cc: "
-msgstr "Másolat: "
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Válasszon egy fájlt"
 
-#: ../src/client/composer/composer-widget.vala:1651
-msgid "Bcc: "
-msgstr "Titkos másolat: "
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "C_satolás"
 
-#: ../src/client/composer/composer-widget.vala:1654
-msgid "Reply-To: "
-msgstr "Válaszcím: "
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr "További címek a következőhöz: %s"
 
-#: ../src/client/composer/composer-widget.vala:1887
-msgid "Select Color"
-msgstr "Szín kiválasztása"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Fiókok"
 
-#. 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:2322
-#, c-format
-msgid "%1$s via %2$s"
-msgstr "%1$s ezen keresztül: %2$s"
+#. / 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 "Last First"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2364
-msgid "_From:"
-msgstr "_Feladó:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Üdvözli a Geary!"
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Én"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Adja meg a fiókinformációit a kezdéshez."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 hétre visszamenőleg"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 hónapra visszamenőleg"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 hónapra visszamenőleg"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 hónapra visszamenőleg"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 évre visszamenőleg"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "2 évre visszamenőleg"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "4 évre visszamenőleg"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Minden"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "Szerkesztés"
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr "Előnézet"
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "_Jelszavak megjegyzése"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "_Jelszó megjegyzése"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Nem sikerült érvényesíteni:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Érvénytelen fiók becenév.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr ""
+"        &#8226; Az e-mail cím már hozzá lett adva a Geary programhoz.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; IMAP kapcsolódási hiba.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Az IMAP felhasználónév vagy jelszó helytelen.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; SMTP kapcsolódási hiba.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; Az SMTP felhasználónév vagy jelszó helytelen.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Kapcsolódási hiba.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; A felhasználónév vagy jelszó helytelen.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Mentés"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Hozzáadás"
+
+#. / 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 "%k.%M"
+
+#. / 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 "%k.%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 "%b. %-e."
+
+#. / 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 "%Y. %B %-e. %-k.%M"
+
+#. / 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 "%Y. %B %-e. %-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 "%Y. %B %-e. %-k.%M"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Most"
+
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "%dm óta"
+msgstr[1] "%dm óta"
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "%dh óta"
+msgstr[1] "%dh óta"
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Tegnap"
+
+#. / 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
+msgid "%A"
+msgstr "%A"
+
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "bájt"
+
+#: ../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/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d levél"
+msgstr[1] "%d levél"
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d olvasatlan"
+msgstr[1] "%d olvasatlan"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Beérkezett üzenetek"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "%s fiók keresése"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d találat"
+msgstr[1] "%d találat"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "Nincs beszélgetés kiválasztva."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "%u beszélgetés kijelölve."
@@ -1002,41 +1187,37 @@ msgid "Date:"
 msgstr "Dátum:"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "%u olvasott levél"
 msgstr[1] "%u olvasott levél"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr ""
 "Ez a levél sikeresen el lett küldve, de nem sikerült elmenteni ide: %s."
 
-#. Add a menu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Másolás"
 
-#. Add a menu item for copying the address.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "_E-mail cím másolása"
 
-#. Add a menu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "_Hivatkozás másolása"
 
-#. Select message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "_Levél kijelölése"
 
-#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Ö_sszes kijelölése"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "_Vizsgálat"
@@ -1049,7 +1230,6 @@ msgstr "Úgy tűnik, ez a hivatkozás ide mutat"
 msgid "but actually goes to"
 msgstr "de valójában ide ugrik"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
 msgstr " (Érvénytelen?)"
@@ -1072,12 +1252,10 @@ msgid_plural "Save All A_ttachments..."
 msgstr[0] "M_elléklet mentése…"
 msgstr[1] "Minden m_elléklet mentése…"
 
-#. Reply to all on a message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "_Válasz mindenkinek"
 
-#. Mark as read/unread.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "_Megjelölés olvasottként"
@@ -1090,1069 +1268,627 @@ msgstr "_Megjelölés olvasatlanként"
 msgid "Mark Unread From _Here"
 msgstr "Megjelölés olvasatlanként _innentől"
 
-#. Separator.
-#. View original message source.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "_Forrás megtekintése"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:378
-msgid "none"
-msgstr "nincs"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "Nem sikerült megnyitni az alapértelmezett szövegszerkesztőt."
 
 #: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s - Beszélgetés felügyelő"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Válasszon egy fájlt"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Elmentve"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "C_satolás"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Mentés"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
-msgid "Untrusted Connection: %s"
-msgstr "Nem megbízható kapcsolat: %s"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Hiba a mentéskor"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
-msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr ""
-"A(z) %s levelező kiszolgáló személyazonossága a(z) %s:%u címen nem "
-"ellenőrizhető."
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "Nyomja meg a Backspace billentyűt az idézet törléséhez"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
-msgid ""
-"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-"your username and password to be transmitted insecurely."
-msgstr ""
-"A „Megbízom a kiszolgálóban” és a „Mindig megbízom a kiszolgálóban” "
-"választása a felhasználónév és jelszó nem biztonságos átvitelét okozhatja."
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Új levél"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-"server."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"A „Nem bízom meg a kiszolgálóban” választása azt fogja okozni, hogy a Geary "
-"nem férhet hozzá ehhez a kiszolgálóhoz."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures|CV|cover|letter|csatol|csatolás|csatolá"
+"st|csatolásokat|csatolmány|csatolmányt|csatolmányok|csatolmányokat|csatolva|c"
+"satolom|csatoltam|mellékel|melléklet|mellékletet|mellékletek|mellékleteket|me"
+"llékelve|mellékelem|mellékeltem|küldöm|elküldöm|átküldöm|postázom|fájl|fájlt|"
+"fájlok|fájlokat|állomány|állományt|állományok|állományokat|életrajz|életrajzo"
+"t|életrajzom|életrajzomat|önéletrajz|önéletrajzot|önéletrajzom|önéletrajzomat"
+"|.doc|.docx|.pdf|.xls|.xlsx|.ppt|.pptx|.rtf|.pps|.odt|.ods|.odp|.odg|.odb"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
-msgid "Geary will not add or update this email account."
-msgstr "A Geary nem fogja hozzáadni vagy frissíteni ezt az e-mail fiókot."
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "El szeretné dobni ezt a levelet?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-"this account."
-msgstr ""
-"A „Nem bízom meg a kiszolgálóban” választása azt fogja okozni, hogy a Geary "
-"leállítja a hozzáférést ehhez a fiókhoz."
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Elküldi a levelet üres tárggyal és törzzsel?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr "A Geary ki fog lépni, ha nincs más megnyitott e-mail fiókja."
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Elküldi a levelet üres tárggyal?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
-msgid ""
-"Contact your system administrator or email service provider if you have any "
-"question about these issues."
-msgstr ""
-"Lépjen kapcsolatba a rendszergazdával vagy az e-mail szolgáltatójával, ha "
-"bármilyen kérdése van ezzel a hibával kapcsolatban."
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Elküldi a levelet üres törzzsel?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
-msgstr "A kiszolgáló tanúsítványát nem ismert hitelesítésszolgáltató írta alá"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Elküldi a levelet melléklet nélkül?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
-msgid "The server's identity does not match the identity in the certificate"
-msgstr ""
-"A kiszolgáló személyazonossága nem egyezik a tanúsítványban lévő "
-"személyazonossággal"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Nem sikerült mellékletet hozzáadni"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
-msgid "The server's certificate has expired"
-msgstr "A kiszolgáló tanúsítványa lejárt"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "„%s” nem található."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
-msgid "The server's certificate has not been activated"
-msgstr "A kiszolgáló tanúsítványát még nem aktiválták"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "„%s” egy mappa."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
-msgid "The server's certificate has been revoked and is now invalid"
-msgstr "A kiszolgáló tanúsítványát visszavonták és most érvénytelen"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "„%s” egy üres fájl."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
-msgid "The server's certificate is considered insecure"
-msgstr "A kiszolgáló tanúsítványa nem tekinthető biztonságosnak"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "„%s” nem nyitható meg olvasásra."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
-msgid "An error has occurred processing the server's certificate"
-msgstr "Hiba történt a kiszolgáló tanúsítványának feldolgozása során"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "„%s” már csatolva van a küldeményhez."
 
-#. 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 "Geary requires your email password to continue"
-msgstr "A Geary az e-mail jelszavát igényli a folytatáshoz"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. 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 levél"
-msgstr[1] "%d levél"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Címzett: "
 
-#. / 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 olvasatlan"
-msgstr[1] "%d olvasatlan"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Másolat: "
 
-#. / 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/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Titkos másolat: "
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Beérkezett üzenetek"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "Válaszcím: "
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d találat"
-msgstr[1] "%d találat"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Szín kiválasztása"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Új levelek"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr "%1$s ezen keresztül: %2$s"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d új levél"
-msgstr[1] "%d új levél"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_Feladó:"
 
-#: ../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] "%s, összesen %d új levél"
-msgstr[1] "%s, összesen %d új levél"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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"
-"(további %d új levél ehhez: %s)"
-msgstr[1] ""
-"%s\n"
-"(további %d új levél ehhez: %s)"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Küldés…"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Megnyitás"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i találat"
+msgstr[1] "%i találat"
 
-#. / 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 "%k.%M"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i találat (körbeért)"
+msgstr[1] "%i találat (körbeért)"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "nincs találat"
 
-#. / 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 "%k.%M"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_OK"
 
-#. / 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 "%b. %-e."
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "Mé_gse"
 
-#. / 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"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Bezárás"
 
-#. / 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 "%Y. %B %-e. %-k.%M"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "El_dobás"
 
-#. / 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 "%Y. %B %-e. %-H.%M"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Megnyitás"
 
-#. / 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 "%Y. %B %-e. %-k.%M"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Nyomtatás…"
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Most"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Eltávolítás"
 
-#: ../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "%dm óta"
-msgstr[1] "%dm óta"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Megtartás"
 
-#: ../src/client/util/util-date.vala:171
-#, c-format
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "%dh óta"
-msgstr[1] "%dh óta"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "A fiók minden levélének keresése kulcsszavakra (Ctrl+S)"
 
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "Tegnap"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "%s fiók indexelése"
 
-#. / 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"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(nincs tárgy)"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary levelező"
 
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "bájt"
+#~ msgid "Send and receive email"
+#~ msgstr "E-mailek küldése és fogadása"
 
-#: ../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Email;E-mail;Levél;"
 
-#: ../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#~ msgid "Compose Message"
+#~ msgstr "Levél írása"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#~ msgid "Send by email"
+#~ msgstr "Elküldés levélben"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#~ msgid "Send files using Geary"
+#~ msgstr "Fájlok küldése a Geary használatával"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#~ msgid "_Donate"
+#~ msgstr "_Adományozás"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Nem sikerült eltávolítani a "
+#~ "fiókot</span> "
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Ezen fiók szerkesztő ablaka jelenleg meg van nyitva. Küldje el vagy vesse el "
+#~ "a levelet, és próbálja újra."
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Egyéb"
+#~ msgid "Add account"
+#~ msgstr "Fiók hozzáadása"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#~ msgid "Edit account"
+#~ msgstr "Fiók szerkesztése"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#~ msgid "Remove account"
+#~ msgstr "Fiók eltávolítása"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Beérkezett üzenetek"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Kérem várjon, amíg a Geary érvényesíti a fiókját."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Piszkozatok"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Nem megbízható kapcsolat"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Elküldött levelek"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "Min_dig megbízom a kiszolgálóban"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Csillagozott"
+#~ msgid "_Trust This Server"
+#~ msgstr "_Megbízom a kiszolgálóban"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Fontos"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "_Nem bízom meg a kiszolgálóban"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Minden levél"
+#~ msgid "_Undo"
+#~ msgstr "_Visszavonás"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Levélszemét"
+#~ msgid "_Redo"
+#~ msgstr "Új_ra"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Kuka"
+#~ msgid "Cu_t"
+#~ msgstr "_Kivágás"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Postázandó"
+#~ msgid "_Paste"
+#~ msgstr "_Beillesztés"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Archívum"
+#~ msgid "_Left"
+#~ msgstr "_Balra"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-msgstr "Nincs"
+#~ msgid "_Right"
+#~ msgstr "_Jobbra"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-msgid "attachment"
-msgstr "melléklet"
+#~ msgid "_Center"
+#~ msgstr "_Középre"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
-msgstr "titkos másolat"
+#~ msgid "_Justify"
+#~ msgstr "_Sorkizárt"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
-msgstr "törzs"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Hivatkozás (Ctrl+L)"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "cc"
-msgstr "másolat"
+#~ msgid "C_olor"
+#~ msgstr "_Szín"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
-msgstr "feladó"
+#~ msgid "More options"
+#~ msgstr "További beállítások"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-msgid "subject"
-msgstr "tárgy"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Szöveg idézése (Ctrl+])"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
-msgstr "címzett"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Szöveg idézésének visszavonása (Ctrl+[)"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
-msgstr "én"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Formázás eltávolítása (Ctrl+Space)"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-msgid "Drafts | Draft"
-msgstr "Piszkozatok | Piszkozat"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Beillesztés _formázással"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "Elküldött | Elküldött levelek | Elküldött üzenetek"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Félkövér (Ctrl+B)"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
-msgstr "Szemét | Spam | Levélszemét"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Dőlt (Ctrl+I)"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Kuka | Szemét"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Aláhúzott (Ctrl+U)"
 
-#. List of folder names to match for Archive, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
-msgid "Archive | Archives"
-msgstr "Archívum | Archívumok | Archiváltak"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Áthúzott (Ctrl+K)"
 
-#. / 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:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%Y. %b. %-e., %a %-k.%M-kor"
+#~ msgid "_Rich Text"
+#~ msgstr "_Rich Text"
 
-#. / 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:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "%1$s-kor, %2$s írta:"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Kiterjesztett mezők megjelenítése"
 
-#. / 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:228
-#, c-format
-msgid "%s wrote:"
-msgstr "%s írta:"
+#~ msgctxt "Label"
+#~ msgid "Close and Save"
+#~ msgstr "Bezárás és mentés"
 
-#. / 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:234
-#, c-format
-msgid "On %s:"
-msgstr "Ekkor: %s:"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "Bezárás és mentés"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Továbbított levél -----------"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "Bezárás és mentés"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "Feladó: %s\n"
+#~ msgctxt "Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Bezárás és eldobás"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Tárgy: %s\n"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Bezárás és eldobás"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "Dátum: %s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "Bezárás és eldobás"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "Címzett: %s\n"
+#~ msgid "Lar_ge"
+#~ msgstr "_Nagy"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Másolat: %s\n"
+#~ msgid "Large"
+#~ msgstr "Nagy"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Nem sikerült eltávolítani a fiókot</"
-"span> "
+#~ msgid "_Medium"
+#~ msgstr "_Közepes"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Ezen fiók szerkesztő ablaka jelenleg meg van nyitva. Küldje el vagy vesse el "
-"a levelet, és próbálja újra."
+#~ msgid "Medium"
+#~ msgstr "Közepes"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Fiók hozzáadása"
+#~ msgid "_Small"
+#~ msgstr "Ki_csi"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Fiók szerkesztése"
+#~ msgid "Small"
+#~ msgstr "Kicsi"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Fiók eltávolítása"
+#~ msgid "S_ans Serif"
+#~ msgstr "T_alpatlan betűkészlet"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Kérem várjon, amíg a Geary érvényesíti a fiókját."
+#~ msgid "Sans Serif"
+#~ msgstr "Talpatlan betűkészlet"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Nem megbízható kapcsolat"
+#~ msgid "S_erif"
+#~ msgstr "Talpas b_etűkészlet"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "Min_dig megbízom a kiszolgálóban"
+#~ msgid "Serif"
+#~ msgstr "Talpas betűkészlet"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "_Megbízom a kiszolgálóban"
+#~ msgid "_Fixed Width"
+#~ msgstr "_Rögzített szélességű"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "_Nem bízom meg a kiszolgálóban"
+#~ msgid "Fixed Width"
+#~ msgstr "Rögzített szélességű"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Visszavonás"
-
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "Új_ra"
-
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "_Kivágás"
-
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "_Beillesztés"
-
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Balra"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Jobbra"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Középre"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Sorkizárt"
-
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Hivatkozás (Ctrl+L)"
-
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "_Szín"
-
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "További beállítások"
-
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Szöveg idézése (Ctrl+])"
-
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Szöveg idézésének visszavonása (Ctrl+[)"
-
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Formázás eltávolítása (Ctrl+Space)"
-
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Beillesztés _formázással"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Félkövér (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Dőlt (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Aláhúzott (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Áthúzott (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "_Rich Text"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Kiterjesztett mezők megjelenítése"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "Bezárás és mentés"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "Bezárás és mentés"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "Bezárás és mentés"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "Bezárás és eldobás"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "Bezárás és eldobás"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "Bezárás és eldobás"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "_Nagy"
-
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "Nagy"
-
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "_Közepes"
-
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "Közepes"
-
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "Ki_csi"
-
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "Kicsi"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "T_alpatlan betűkészlet"
-
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "Talpatlan betűkészlet"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "Talpas b_etűkészlet"
-
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "Talpas betűkészlet"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "_Rögzített szélességű"
-
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "Rögzített szélességű"
-
-#: ../ui/composer.glade.h:42
-msgid "Detach"
-msgstr "Leválasztás"
-
-#: ../ui/composer.glade.h:43
-msgid "Detach (Ctrl+D)"
-msgstr "Leválasztás (Ctrl+D)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_Küldés"
-
-#: ../ui/composer.glade.h:45
-msgid "Send"
-msgstr "Küldés"
-
-#: ../ui/composer.glade.h:46
-msgid "Send (Ctrl+Enter)"
-msgstr "Küldés (Ctrl+Enter)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "Fájl _csatolása"
-
-#: ../ui/composer.glade.h:48
-msgid "Attach File"
-msgstr "Fájl csatolása"
-
-#: ../ui/composer.glade.h:49
-msgid "_Include Original Attachments"
-msgstr "_Eredeti mellékletek megtartása"
-
-#: ../ui/composer.glade.h:50
-msgid "Include Original Attachments"
-msgstr "Eredeti mellékletek megtartása"
-
-#: ../ui/composer.glade.h:51
-msgid "Application Menu"
-msgstr "Alkalmazásmenü"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:53
-msgid "_To"
-msgstr "_Címzett"
+#~ msgid "Detach"
+#~ msgstr "Leválasztás"
 
-#: ../ui/composer.glade.h:54
-msgid "_Cc"
-msgstr "_Másolat"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Leválasztás (Ctrl+D)"
 
-#: ../ui/composer.glade.h:55
-msgid "_Subject"
-msgstr "_Tárgy"
+#~ msgid "_Send"
+#~ msgstr "_Küldés"
 
-#: ../ui/composer.glade.h:56
-msgid "_Bcc"
-msgstr "Titk_os másolat"
+#~ msgid "Send"
+#~ msgstr "Küldés"
 
-#: ../ui/composer.glade.h:57
-msgid "_Reply-To"
-msgstr "_Válaszcím"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Küldés (Ctrl+Enter)"
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:59
-msgid "From"
-msgstr "Feladó"
+#~ msgid "_Attach File"
+#~ msgstr "Fájl _csatolása"
 
-#: ../ui/composer.glade.h:60
-msgid "Drop files here"
-msgstr "Ejtse ide a fájlokat"
+#~ msgid "Attach File"
+#~ msgstr "Fájl csatolása"
 
-#: ../ui/composer.glade.h:61
-msgid "To add them as attachments"
-msgstr "Mellékletként való hozzáadáshoz"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Eredeti mellékletek megtartása"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-msgid "Remove email address"
-msgstr "E-mail cím eltávolítása"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Eredeti mellékletek megtartása"
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"Néhány e-mail szolgáltatás további címek beállítását igényli a kiszolgálón. "
-"További információkért lépjen kapcsolatba az e-mail szolgáltatójával."
+#~ msgid "Application Menu"
+#~ msgstr "Alkalmazásmenü"
 
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "_Frissítés"
+#~ msgid "_To"
+#~ msgstr "_Címzett"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Keresés:"
+#~ msgid "_Cc"
+#~ msgstr "_Másolat"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Előző"
+#~ msgid "_Subject"
+#~ msgstr "_Tárgy"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Következő"
+#~ msgid "_Bcc"
+#~ msgstr "Titk_os másolat"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "K_is- és nagybetűk megkülönböztetése"
+#~ msgid "_Reply-To"
+#~ msgstr "_Válaszcím"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "címke"
+#~ msgid "From"
+#~ msgstr "Feladó"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Jelszó"
+#~ msgid "Drop files here"
+#~ msgstr "Ejtse ide a fájlokat"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "E-mail cím"
+#~ msgid "To add them as attachments"
+#~ msgstr "Mellékletként való hozzáadáshoz"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Jelszó"
+#~ msgid "Remove email address"
+#~ msgstr "E-mail cím eltávolítása"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "_Szolgáltatás"
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "Néhány e-mail szolgáltatás további címek beállítását igényli a kiszolgálón. "
+#~ "További információkért lépjen kapcsolatba az e-mail szolgáltatójával."
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "_Név"
+#~ msgid "_Update"
+#~ msgstr "_Frissítés"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "_Becenév"
+#~ msgid "Find:"
+#~ msgstr "Keresés:"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Munkahelyi, otthoni, stb."
+#~ msgid "_Previous"
+#~ msgstr "_Előző"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "Elküldött levél _mentése"
+#~ msgid "_Next"
+#~ msgstr "_Következő"
 
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
-msgstr "_További e-mail címek…"
+#~ msgid "_Case sensitive"
+#~ msgstr "K_is- és nagybetűk megkülönböztetése"
 
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "IMAP beállítások"
+#~ msgid "label"
+#~ msgstr "címke"
 
-#: ../ui/login.glade.h:12
-msgid "Se_rver"
-msgstr "_Kiszolgáló"
+#~ msgid "Password"
+#~ msgstr "Jelszó"
 
-#: ../ui/login.glade.h:13
-msgid "P_ort"
-msgstr "_Port"
+#~ msgid "E_mail address"
+#~ msgstr "E-mail cím"
 
-#: ../ui/login.glade.h:14
-msgid "Ser_ver"
-msgstr "Ki_szolgáló"
+#~ msgid "_Password"
+#~ msgstr "_Jelszó"
 
-#: ../ui/login.glade.h:15
-msgid "Por_t"
-msgstr "Por_t"
+#~ msgid "S_ervice"
+#~ msgstr "_Szolgáltatás"
 
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "SMTP beállítások"
+#~ msgid "N_ame"
+#~ msgstr "_Név"
 
-#: ../ui/login.glade.h:17
-msgid "User_name"
-msgstr "_Felhasználónév"
+#~ msgid "N_ickname"
+#~ msgstr "_Becenév"
 
-#: ../ui/login.glade.h:18
-msgid "Pass_word"
-msgstr "_Jelszó"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Munkahelyi, otthoni, stb."
 
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr "SMTP felhasználónév"
+#~ msgid "_Save sent mail"
+#~ msgstr "Elküldött levél _mentése"
 
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr "SMTP jelszó"
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "_További e-mail címek…"
 
-#: ../ui/login.glade.h:21
-msgid "_Username"
-msgstr "_Felhasználónév"
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP beállítások"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr "IMAP felhasználónév"
+#~ msgid "Se_rver"
+#~ msgstr "_Kiszolgáló"
 
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr "IMAP jelszó"
+#~ msgid "P_ort"
+#~ msgstr "_Port"
 
-#: ../ui/login.glade.h:24
-msgid "Encr_yption"
-msgstr "_Titkosítás"
+#~ msgid "Ser_ver"
+#~ msgstr "Ki_szolgáló"
 
-#: ../ui/login.glade.h:25
-msgid "Encrypt_ion"
-msgstr "T_itkosítás"
+#~ msgid "Por_t"
+#~ msgstr "Por_t"
 
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP beállítások"
 
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "User_name"
+#~ msgstr "_Felhasználónév"
 
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "Nincs szükség _hitelesítésre"
+#~ msgid "Pass_word"
+#~ msgstr "_Jelszó"
 
-#: ../ui/login.glade.h:30
-msgid "Use IMAP cre_dentials"
-msgstr "IMAP hitelesítési _adatok használata"
+#~ msgid "SMTP username"
+#~ msgstr "SMTP felhasználónév"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Szerkesztő"
+#~ msgid "SMTP password"
+#~ msgstr "SMTP jelszó"
 
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr "_Piszkozatok mentése a kiszolgálón"
+#~ msgid "_Username"
+#~ msgstr "_Felhasználónév"
 
-#: ../ui/login.glade.h:33
-msgid "Si_gn emails (HTML allowed):"
-msgstr "E-mailek _aláírása (HTML engedélyezett):"
+#~ msgid "IMAP username"
+#~ msgstr "IMAP felhasználónév"
 
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "Tároló"
+#~ msgid "IMAP password"
+#~ msgstr "IMAP jelszó"
 
-#: ../ui/login.glade.h:35
-msgid "_Download mail"
-msgstr "Levél l_etöltése"
+#~ msgid "Encr_yption"
+#~ msgstr "_Titkosítás"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "SMTP hitelesítési adatok"
+#~ msgid "Encrypt_ion"
+#~ msgstr "T_itkosítás"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "Felhasználónév"
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "Jelszó _megjegyzése"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Hitelesítés"
+#~ msgid "No authentication re_quired"
+#~ msgstr "Nincs szükség _hitelesítésre"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Olvasás"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "IMAP hitelesítési _adatok használata"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "Következő levél _automatikus kiválasztása"
+#~ msgid "Composer"
+#~ msgstr "Szerkesztő"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "_Beszélgetés előnézetének megjelenítése"
+#~ msgid "Save dra_fts on server"
+#~ msgstr "_Piszkozatok mentése a kiszolgálón"
 
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr "_Három ablaktábla nézet használata"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "E-mailek _aláírása (HTML engedélyezett):"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "_Helyesírás-ellenőrzés bekapcsolása"
+#~ msgid "Storage"
+#~ msgstr "Tároló"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "Értesítések"
+#~ msgid "_Download mail"
+#~ msgstr "Levél l_etöltése"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "Értesítő hangok ­_lejátszása"
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP hitelesítési adatok"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "É_rtesítések megjelenítése új levél érkezésekor"
+#~ msgid "Username"
+#~ msgstr "Felhasználónév"
 
-#: ../ui/preferences.glade.h:10
-msgid "Always _watch for new mail"
-msgstr "Mindig _figyeljen az új levél érkezésére"
+#~ msgid "_Remember password"
+#~ msgstr "Jelszó _megjegyzése"
 
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr "A Geary a háttérben fog futni és értesíteni fog új levél érkezésekor"
+#~ msgid "_Authenticate"
+#~ msgstr "_Hitelesítés"
 
-#: ../ui/preferences.glade.h:12
-msgid "Preferences"
-msgstr "Beállítások"
+#~ msgid "Reading"
+#~ msgstr "Olvasás"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Biztosan el szeretné távolítani ezt a "
-"fiókot?</span> "
+#~ msgid "_Automatically select next message"
+#~ msgstr "Következő levél _automatikus kiválasztása"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"A fiókhoz tartozó összes e-mail el lesz távolítva a számítógépről. Ez nem "
-"fogja érinteni a kiszolgálón lévő e-maileket."
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Beszélgetés előnézetének megjelenítése"
+
+#~ msgid "Use _three pane view"
+#~ msgstr "_Három ablaktábla nézet használata"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "_Helyesírás-ellenőrzés bekapcsolása"
+
+#~ msgid "Notifications"
+#~ msgstr "Értesítések"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "Értesítő hangok ­_lejátszása"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "É_rtesítések megjelenítése új levél érkezésekor"
+
+#~ msgid "Always _watch for new mail"
+#~ msgstr "Mindig _figyeljen az új levél érkezésére"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr "A Geary a háttérben fog futni és értesíteni fog új levél érkezésekor"
+
+#~ msgid "Preferences"
+#~ msgstr "Beállítások"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Biztosan el szeretné távolítani ezt a "
+#~ "fiókot?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "A fiókhoz tartozó összes e-mail el lesz távolítva a számítógépről. Ez nem "
+#~ "fogja érinteni a kiszolgálón lévő e-maileket."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Becenév:"
+#~ msgid "Nickname:"
+#~ msgstr "Becenév:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "E-mail cím:"
+#~ msgid "Email address:"
+#~ msgstr "E-mail cím:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Geary frissítés folyamatban…"
+#~ msgid "Geary update in progress…"
+#~ msgstr "Geary frissítés folyamatban…"
 
 #~ msgid "Notify of new mail at start_up"
 #~ msgstr "Értesítés új levélről in_dításkor"
@@ -2169,7 +1905,6 @@ msgstr "Geary frissítés folyamatban…"
 #~ msgid "attach|enclosed|enclosing|cover letter"
 #~ msgstr "csatolás|mellékelt|melléklet|levélborító"
 
-#~| msgid "Please enter your email password"
 #~ msgid "Please enter your password"
 #~ msgstr "Adja meg a jelszavát"
 
diff --git a/po/id.po b/po/id.po
index 6c114f1..e810891 100644
--- a/po/id.po
+++ b/po/id.po
@@ -9,426 +9,431 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-10-12 12:38+0000\n"
-"PO-Revision-Date: 2014-10-16 19:54+0700\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:06+0000\n"
 "Last-Translator: Andika Triwidada <andika gmail com>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/geary/";
-"language/id/)\n"
-"Language: id\n"
+"Language-Team: Indonesian "
+"(http://www.transifex.com/projects/p/geary/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.7\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Klien Surat"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Surat Geary"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Kirim dan terima surel"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Surel;Surat;Email;E-mail;Mail;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Susun Pesan"
+"X-Launchpad-Export-Date: 2015-11-23 05:54+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: id\n"
 
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Kirim melalui surel"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Draf"
 
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Kirim berkas memakai Geary"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
+"Sent | Sent Mail | Sent Email | Sent E-Mail | Surat Keluar | Terkirim"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Simpan"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+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"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "T_ambah"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Trash | Rubbish | Rubbish Bin | Sampah | Tong Sampah | Tempat Sampah"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:19
-msgid "Accounts"
-msgstr "Akun"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#. Copyright 2011-2014 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "NamaDepan NamaBelakang"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Kotak Masuk"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-msgid "Welcome to Geary."
-msgstr "Selamat datang ke Geary."
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Draf"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-msgid "Enter your account information to get started."
-msgstr "Masukkan info akun Anda untuk memulai."
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Kirim Surat"
 
-#: ../src/client/accounts/add-edit-page.vala:247
-msgid "2 weeks back"
-msgstr "2 minggu ke belakang"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Dibintangi"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:248
-msgid "1 month back"
-msgstr "1 bulan ke belakang"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Penting"
 
-#: ../src/client/accounts/add-edit-page.vala:249
-msgid "3 months back"
-msgstr "3 bulan ke belakang"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Semua Pesan"
 
-#: ../src/client/accounts/add-edit-page.vala:250
-msgid "6 months back"
-msgstr "6 bulan ke belakang"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Spam"
 
-#: ../src/client/accounts/add-edit-page.vala:251
-msgid "1 year back"
-msgstr "1 tahun ke belakang"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Sampah"
 
-#: ../src/client/accounts/add-edit-page.vala:252
-msgid "2 years back"
-msgstr "2 tahun ke belakang"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Kotak Keluar"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "4 years back"
-msgstr "4 tahun ke belakang"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Cari"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "Everything"
-msgstr "Semua"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Arsip"
 
-#: ../src/client/accounts/add-edit-page.vala:686
-msgid "Remem_ber passwords"
-msgstr "I_ngat sandi"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Nihil"
 
-#: ../src/client/accounts/add-edit-page.vala:693 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "I_ngat sandi"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:727
-msgid "Unable to validate:\n"
-msgstr "Tak dapat mengesahkan:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:729
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "&#8226; Nama panggilan akun tidak sah.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:732
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr ""
-"&#8226; Alamat surel telah ditambahkan ke Geary.\n"
-"\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:736
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "&#8226; Galat koneksi IMAP.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:739
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "&#8226; Nama pengguna atau sandi IMAP salah.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Lainnya"
 
-#: ../src/client/accounts/add-edit-page.vala:742
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "&#8226; Koneksi SMTP galat.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "lampiran"
 
-#: ../src/client/accounts/add-edit-page.vala:745
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "&#8226; Nama pengguna atau sandi SMTP salah.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "bcc"
 
-#: ../src/client/accounts/add-edit-page.vala:749
-msgid "        &#8226; Connection error.\n"
-msgstr "&#8226; Galat koneksi.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "body"
 
-#: ../src/client/accounts/add-edit-page.vala:753
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "&#8226; Nama pengguna atau sandi salah.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "cc"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2014 Yorba Foundation"
-msgstr "Hak Cipta 2011-2014 Yorba Foundation"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "from"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Kunjungi halaman web Yorba"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "perihal"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Mulai Geary dengan jendela utama tersembunyi"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "to"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Keluaran informasi pengawakutuan"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "me"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Catat pemantauan percakapan"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(tanpa perihal)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Catat deserialisasi jaringan"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %-e %b %Y pada %-H:%M"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Catat aktivitas jaringan"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "Pada %1$s, %2$s menulis:"
 
-#. / 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 "Catat antrian putar ulang IMAP"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s menulis:"
 
-#. / 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 "Catat serialisasi jaringan"
+#. / 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:234
+msgid "On %s:"
+msgstr "Pada %s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Catat aktivitas periodik"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Pesan yang diteruskan --------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Catat kuiri basis data (menimbulkan banyak pesan)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Dari: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Catat normalisasi map"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Perihal: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Izinkan inspeksi WebView"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Tanggal: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Cabut semua sertifikat server yang memiliki peringatan TLS"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Kepada: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Tampilkan versi program"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Cc: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Pakai %s untuk membuka jendela penyusun baru"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "nihil"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Harap kirimkan komentar, saran, dan kutu ke:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Klien Surat"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Gagal mengurai opsi baris perintah: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Baris perintah asing \"%s\"\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Kunjungi halaman web Yorba"
 
-#: ../src/client/application/geary-controller.vala:56
-msgid "_Delete"
-msgstr "_Hapus"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Hapus percakapan (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Hapus percakapan (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:62
-msgid "_Trash"
-msgstr "_Tong Sampah"
-
-#: ../src/client/application/geary-controller.vala:63
-msgid "Move conversation to trash (Delete, Backspace)"
-msgstr "Pindahkan percakapan ke tong sampah (Delete, Backspace)"
-
-#: ../src/client/application/geary-controller.vala:64
-msgid "Move conversations to trash (Delete, Backspace)"
-msgstr "Pindahkan percakapan ke tong sampah (Delete, Backspace)"
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr ""
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
 #: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Arsip"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Arsipkan percakapan (A)"
 
-#: ../src/client/application/geary-controller.vala:70
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Arsipkan percakapan (A)"
 
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Tandai sebagai S_pam"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Tandai sebagai bukan S_pam"
 
-#: ../src/client/application/geary-controller.vala:76
-#: ../src/client/application/geary-controller.vala:295
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Tandai percakapan"
 
-#: ../src/client/application/geary-controller.vala:77
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Tandai percakapan"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Tambahkan label ke percakapan"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Tambahkan label ke percakapan"
 
-#: ../src/client/application/geary-controller.vala:80
-#: ../src/client/application/geary-controller.vala:334
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Pindahkan percakapan"
 
-#: ../src/client/application/geary-controller.vala:81
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Pindahkan percakapan"
 
-#: ../src/client/application/geary-controller.vala:271
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "A_kun"
 
-#: ../src/client/application/geary-controller.vala:276
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Preferensi"
 
-#: ../src/client/application/geary-controller.vala:280
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Bantuan"
 
-#: ../src/client/application/geary-controller.vala:284
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "Tent_ang"
 
-#: ../src/client/application/geary-controller.vala:288
-msgid "_Donate"
-msgstr "_Sumbang"
-
-#: ../src/client/application/geary-controller.vala:292
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Keluar"
 
-#: ../src/client/application/geary-controller.vala:297
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "Tan_dai sebagai..."
 
-#: ../src/client/application/geary-controller.vala:303
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Tandai Sudah Di_baca"
 
-#: ../src/client/application/geary-controller.vala:309
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Tandai _Belum Dibaca"
 
-#: ../src/client/application/geary-controller.vala:315
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Bintangi"
 
-#: ../src/client/application/geary-controller.vala:320
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "Hapus bi_ntang"
 
-#: ../src/client/application/geary-controller.vala:330
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Tambah label"
 
-#: ../src/client/application/geary-controller.vala:331
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Label"
 
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Pindahkan"
 
-#: ../src/client/application/geary-controller.vala:339
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Susun pesan baru (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:343
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1692
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "B_alas"
 
-#: ../src/client/application/geary-controller.vala:344
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Balas (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:348
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "Balas S_emua"
 
-#: ../src/client/application/geary-controller.vala:349
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Balas semua (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:354
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1702
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Teruskan"
 
-#: ../src/client/application/geary-controller.vala:355
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Maju (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:623
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Tak bisa menyimpan pengecualian kepercayaan server"
 
-#: ../src/client/application/geary-controller.vala:860
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Pengaturan Anda tak aman"
 
-#: ../src/client/application/geary-controller.vala:861
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -438,17 +443,17 @@ msgstr ""
 "nama pengguna dan sandi Anda bisa dibaca orang lain di jaringan ini. Anda "
 "yakin ingin melakukan ini?"
 
-#: ../src/client/application/geary-controller.vala:862
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "La_njutkan"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:940
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Galat saat mengirim surel"
 
-#: ../src/client/application/geary-controller.vala:941
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -456,14 +461,12 @@ msgstr ""
 "Gary menemui galat ketika mengirim sebuah surel. Bila masalah tetap muncul, "
 "harap hapus surel secara manual dari folder Kotak Keluar Anda."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:945
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Galat saat menyimpan surel terkirim"
 
-#: ../src/client/application/geary-controller.vala:946
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -471,20 +474,15 @@ msgstr ""
 "Gary menemui galat ketika menyimpan sebuah surel terkirim ke Sent Mail.  "
 "Pesan akan tetap berada di folder Kotak Keluar Anda sampai Anda menghapusnya."
 
-#: ../src/client/application/geary-controller.vala:1015
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Label"
 
-#. 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:1027
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Tak bisa membuka basis data bagi %s"
 
-#: ../src/client/application/geary-controller.vala:1028
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -507,21 +505,19 @@ msgstr ""
 "Membangun ulang basis data akan menghancurkan semua surel lokal dan "
 "lampirannya. <b>Surat pada server Anda tak akan terpengaruh.</b>"
 
-#: ../src/client/application/geary-controller.vala:1030
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "_Bangun Ulang"
 
-#: ../src/client/application/geary-controller.vala:1030
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "_Keluar"
 
-#: ../src/client/application/geary-controller.vala:1039
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Tak bisa membangun ulang basis data bagi \"%s\""
 
-#: ../src/client/application/geary-controller.vala:1040
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -531,17 +527,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1062
-#: ../src/client/application/geary-controller.vala:1072
-#: ../src/client/application/geary-controller.vala:1083
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Tak bisa membuka kotak surat bagi %s"
 
-#: ../src/client/application/geary-controller.vala:1063
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -559,7 +551,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1073
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -573,7 +565,7 @@ msgstr ""
 "\n"
 "Harap pasang versi Geary terbaru dan coba lagi."
 
-#: ../src/client/application/geary-controller.vala:1084
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -584,26 +576,31 @@ msgstr ""
 "\n"
 "Harap periksa koneksi jaringan Anda dan start ulang Geary."
 
-#: ../src/client/application/geary-controller.vala:1591
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "Tentang %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1594
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
 msgstr ""
 "Andika Triwidada <andika gmail com>, 2012, 2013\n"
 "\n"
-"Dani Pratomo <elementaryindo gmail com>, 2012."
+"Dani Pratomo <elementaryindo gmail com>, 2012.\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Andika Triwidada https://launchpad.net/~andika";
+
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1858
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Anda yakin ingin membuka \"%s\"?"
 
-#: ../src/client/application/geary-controller.vala:1859
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -611,432 +608,179 @@ msgstr ""
 "Lampiran berpotensi bahaya jika dibuka. Hanya buka berkas dari sumber "
 "terpercaya."
 
-#: ../src/client/application/geary-controller.vala:1860
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Jangan t_anya lagi"
 
-#: ../src/client/application/geary-controller.vala:1878
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Berkas bernama \"%s\" sudah ada. Anda ingin menimpanya?"
 
-#: ../src/client/application/geary-controller.vala:1880
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "Berkas telah ada di \"%s\".  Kalau ditimpa isi sebelumnya hilang."
 
-#: ../src/client/application/geary-controller.vala:1883
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "Timp_a"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2152
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Tutup draf pesan yang terbuka?"
 
-#: ../src/client/application/geary-controller.vala:2264
-msgid "Do you want to permanently delete this message?"
-msgid_plural "Do you want to permanently delete these messages?"
-msgstr[0] "Anda mau membuang pesan ini secara permanen?"
-
-#: ../src/client/application/geary-controller.vala:2266
-msgid "Delete"
-msgstr "Hapus"
-
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i cocok"
-
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i cocok (dilipat)"
-
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "tak ditemukan"
-
-#: ../src/client/components/main-toolbar.vala:11
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Cari"
-
-#. Search bar.
-#: ../src/client/components/main-toolbar.vala:78
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Cari kata kunci pada semua surat dalam akun (Ctrl+S)"
-
-#: ../src/client/components/main-toolbar.vala:212
-#, c-format
-msgid "Indexing %s account"
-msgstr "Mengindeks akun %s"
-
-#: ../src/client/components/main-toolbar.vala:223
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Cari akun %s"
-
-#: ../src/client/components/main-window.vala:323
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Mengirim..."
-
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
-#: ../src/client/components/stock.vala:19 ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "Ba_tal"
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
 
-#: ../src/client/components/stock.vala:23 ../ui/account_list.glade.h:4
-#: ../ui/preferences.glade.h:2
-msgid "_Close"
-msgstr "_Tutup"
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Buang"
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
+msgstr ""
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Buka"
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Cetak..."
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
+msgstr ""
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "Singki_rkan"
+#: ../src/client/application/geary-controller.vala:2489
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] "Anda mau membuang pesan ini secara permanen?"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1160
-msgid "Select _All"
-msgstr "Pilih Semu_a"
+#: ../src/client/application/geary-controller.vala:2491
+msgid "Delete"
+msgstr "Hapus"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Pertahankan"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:57
-msgid "Saved"
-msgstr "Disimpan"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:58
-msgid "Saving"
-msgstr "Menyimpan"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:59
-msgid "Error saving"
-msgstr "Galat saat menyimpan"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Mulai Geary dengan jendela utama tersembunyi"
 
-#. A 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:120
-msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
-msgstr ""
-"lampiran|melampirkan|dilampirkan|terlampir|attach|attaching|attaches|"
-"attachment|attachments|attached|enclose|enclosed|enclosing|encloses|"
-"enclosure|enclosures"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Keluaran informasi pengawakutuan"
 
-#: ../src/client/composer/composer-widget.vala:878
-msgid "Do you want to discard the unsaved message?"
-msgstr "Anda ingin membuang pesan yang belum disimpan?"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Catat pemantauan percakapan"
 
-#: ../src/client/composer/composer-widget.vala:881
-#: ../src/client/composer/composer-widget.vala:885
-msgid "Do you want to discard this message?"
-msgstr "Anda mau membuang pesan ini?"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Catat deserialisasi jaringan"
 
-#: ../src/client/composer/composer-widget.vala:998
-msgid "Send message with an empty subject and body?"
-msgstr "Kirim pesan dengan subjek dan isi kosong?"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Catat aktivitas jaringan"
 
-#: ../src/client/composer/composer-widget.vala:1000
-msgid "Send message with an empty subject?"
-msgstr "Kirim pesan dengan subjek kosong?"
+#. / 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 "Catat antrian putar ulang IMAP"
 
-#: ../src/client/composer/composer-widget.vala:1002
-msgid "Send message with an empty body?"
-msgstr "Kirim pesan tanpa isi?"
+#. / 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 "Catat serialisasi jaringan"
 
-#: ../src/client/composer/composer-widget.vala:1004
-msgid "Send message without an attachment?"
-msgstr "Kirim pesan tanpa lampiran?"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Catat aktivitas periodik"
 
-#: ../src/client/composer/composer-widget.vala:1187
-msgid "Cannot add attachment"
-msgstr "Tak bisa menambah lampiran"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Catat kuiri basis data (menimbulkan banyak pesan)"
 
-#: ../src/client/composer/composer-widget.vala:1198
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "\"%s\" tidak ditemukan."
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Catat normalisasi map"
 
-#: ../src/client/composer/composer-widget.vala:1205
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" adalah map."
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Izinkan inspeksi WebView"
 
-#: ../src/client/composer/composer-widget.vala:1212
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" adalah berkas kosong."
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Cabut semua sertifikat server yang memiliki peringatan TLS"
 
-#: ../src/client/composer/composer-widget.vala:1226
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "\"%s\" tak bisa dibuka untuk dibaca."
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Tampilkan versi program"
 
-#: ../src/client/composer/composer-widget.vala:1233
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" sudah dilampirkan untuk pengiriman."
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Pakai %s untuk membuka jendela penyusun baru"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1242
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Harap kirimkan komentar, saran, dan kutu ke:"
 
-#: ../src/client/composer/composer-widget.vala:1302
-msgid "To: "
-msgstr "Kepada:"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Gagal mengurai opsi baris perintah: %s\n"
 
-#: ../src/client/composer/composer-widget.vala:1305
-msgid "Cc: "
-msgstr "Cc: "
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Baris perintah asing \"%s\"\n"
 
-#: ../src/client/composer/composer-widget.vala:1308
-msgid "Bcc: "
-msgstr "Bcc: "
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Pesan Baru"
 
-#: ../src/client/composer/composer-widget.vala:1525
-msgid "Select Color"
-msgstr "Pilih Warna"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d pesan baru"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:1974
-msgid "_From:"
-msgstr "_Dari:"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, total %d pesan baru"
 
-#. For other types of messages, just show the from account.
-#. Composer label (without mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:1990
-#: ../src/client/conversation-viewer/conversation-viewer.vala:694
-msgid "From:"
-msgstr "Dari:"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d pesan baru lain bagi %s)"
 
-#. Copyright 2011-2014 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Window for sending messages.
-#: ../src/client/composer/composer-window.vala:10
-msgid "New Message"
-msgstr "Pesan Baru"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Buka"
 
 #: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Aku"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:319
-msgid "No conversations selected."
-msgstr "Tidak ada percakapan yang dipilih."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:321
-#, c-format
-msgid "%u conversation selected."
-msgid_plural "%u conversations selected."
-msgstr[0] "%u percakapan dipilih."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:350
-msgid "No search results found."
-msgstr "Tak ada hasil pencarian."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:352
-msgid "No conversations in folder."
-msgstr "Tak ada percakapan dalam map."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:593
-msgid "This message contains remote images."
-msgstr "Pesan ini memuat gambar remote."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:593
-msgid "Show Images"
-msgstr "Tampilkan Gambar"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:594
-msgid "Always Show From Sender"
-msgstr "Selalu Tampilkan Dari Pengirim"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:618
-msgid "Edit Draft"
-msgstr "Sunting Draf"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:697
-msgid "To:"
-msgstr "Ke:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:700
-msgid "Cc:"
-msgstr "Cc:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:703
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:706
-msgid "Subject:"
-msgstr "Perihal:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:709
-msgid "Date:"
-msgstr "Tanggal:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:975
-#, c-format
-msgid "%u read message"
-msgid_plural "%u read messages"
-msgstr[0] "%u pesan terbaca"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1107
-#, c-format
-msgid "This message was sent successfully, but could not be saved to %s."
-msgstr "Pesan ini sukses dikirim, tapi tak bisa disimpan ke %s."
-
-#. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1133
-#: ../ui/composer.glade.h:4
-msgid "_Copy"
-msgstr "Sali_n"
-
-#. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1141
-msgid "Copy _Email Address"
-msgstr "Salin Alamat Sur_el"
-
-#. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1146
-#: ../ui/composer.glade.h:17
-msgid "Copy _Link"
-msgstr "Sa_lin Tautan"
-
-#. Select message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1154
-msgid "Select _Message"
-msgstr "Pilih _Pesan"
-
-#. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1166
-msgid "_Inspect"
-msgstr "Per_iksa"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1392
-msgid "This link appears to go to"
-msgstr "Tautan ini nampaknya menuju ke"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1393
-msgid "but actually goes to"
-msgstr "tapi sebenarnya ke"
-
-#. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1448
-msgid " (Invalid?)"
-msgstr "(Tak valid?)"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1640
-msgid "_Save As..."
-msgstr "_Simpan Sebagai..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1645
-msgid "Save All A_ttachments..."
-msgstr "Simpan Semua _Lampiran..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1659
-msgid "_Save Image As..."
-msgstr "_Simpan Gambar Sebagai..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1682
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "Simpan Semua _Lampiran..."
-
-#. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1697
-msgid "Reply to _All"
-msgstr "Balas ke Semu_a"
-
-#. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1714
-msgid "_Mark as Read"
-msgstr "Tan_dai sudah Dibaca"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
-msgid "_Mark as Unread"
-msgstr "Tan_dai belum Dibaca"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1724
-msgid "Mark Unread From _Here"
-msgstr "Tandai Belum Dibaca Dari _Sini"
-
-#. Separator.
-#. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1739
-msgid "_View Source"
-msgstr "Lihat Su_mber"
-
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2053
-#: ../src/engine/rfc822/rfc822-utils.vala:331
-msgid "none"
-msgstr "nihil"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2188
-msgid "Failed to open default text editor."
-msgstr "Gagal membuka penyunting teks utama."
-
-#: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - Penyidik Percakapan"
-
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Pilih berkas"
-
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "L_ampiri"
-
 #: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
 msgid "Untrusted Connection: %s"
 msgstr "Koneksi Tak Terpercaya: %s"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
 msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr "Identitas dari server surat %s pada %s:%u tak dapat diverifikasi."
 
@@ -1108,77 +852,132 @@ msgstr "Sertifikat server dianggap tidak aman"
 msgid "An error has occurred processing the server's certificate"
 msgstr "Terjadi galat saat memroses sertifikat server"
 
-#. 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 password"
-msgstr "Harap masukkan sandi Anda"
+msgid "Geary requires your email password to continue"
+msgstr ""
 
-#. 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 pesan"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Pilih berkas"
 
-#. / 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 belum dibaca"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "L_ampiri"
 
-#. / 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/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr ""
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Inboks"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Akun"
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d hasil"
+#. / 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 "NamaDepan NamaBelakang"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Pesan Baru"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Selamat datang ke Geary."
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d pesan baru"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Masukkan info akun Anda untuk memulai."
 
-#: ../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] "%s, total %d pesan baru "
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 minggu ke belakang"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 pesan baru lain bagi %s)"
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 bulan ke belakang"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Buka"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 bulan ke belakang"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 bulan ke belakang"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 tahun ke belakang"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "2 tahun ke belakang"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "4 tahun ke belakang"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Semua"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "I_ngat sandi"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "I_ngat sandi"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Tak dapat mengesahkan:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Nama panggilan akun tidak sah.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Alamat surel telah ditambahkan ke Geary.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Galat koneksi IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Nama pengguna atau sandi IMAP salah.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Koneksi SMTP galat.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; Nama pengguna atau sandi SMTP salah.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Galat koneksi.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Nama pengguna atau sandi salah.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Simpan"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "T_ambah"
 
 #. / 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
@@ -1236,13 +1035,11 @@ msgid "Now"
 msgstr "Sekarang"
 
 #: ../src/client/util/util-date.vala:167
-#, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
 msgstr[0] "%dm lalu"
 
 #: ../src/client/util/util-date.vala:171
-#, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
 msgstr[0] "%dj lalu"
@@ -1254,15 +1051,9 @@ msgstr "Kemarin"
 #. / 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:30
-#: ../src/engine/rfc822/rfc822-message.vala:741
-msgid "(no subject)"
-msgstr "(tanpa perihal)"
-
 #: ../src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "byte"
@@ -1287,672 +1078,744 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KB"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d pesan"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d belum dibaca"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Inboks"
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Cari akun %s"
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Lainnya"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d hasil"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Kotak Masuk"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "Tidak ada percakapan yang dipilih."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Draf"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] "%u percakapan dipilih."
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Kirim Surat"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
+msgstr "Tak ada hasil pencarian."
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Dibintangi"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
+msgstr "Tak ada percakapan dalam map."
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Penting"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
+msgstr "Pesan ini memuat gambar remote."
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Semua Pesan"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr "Tampilkan Gambar"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Spam"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
+msgstr "Selalu Tampilkan Dari Pengirim"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Sampah"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
+msgstr "Sunting Draf"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Kotak Keluar"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "Dari:"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Arsip"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "Ke:"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:25
-msgid "None"
-msgstr "Nihil"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Cc:"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.
-#: ../src/engine/imap-db/imap-db-account.vala:662
-msgid "attachment"
-msgstr "lampiran"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Bcc:"
 
-#. / Can be typed in the search box like bcc:johndoe example com to find
-#. / messages bcc'd to a particular person.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:665
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "bcc"
-msgstr "bcc"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "Perihal:"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:668
-msgid "body"
-msgstr "body"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Tanggal:"
 
-#. / Can be typed in the search box like cc:johndoe example com to find
-#. / messages cc'd to a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:671
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "cc"
-msgstr "cc"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] "%u pesan terbaca"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.
-#: ../src/engine/imap-db/imap-db-account.vala:674
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "from"
-msgstr "from"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
+msgstr "Pesan ini sukses dikirim, tapi tak bisa disimpan ke %s."
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:677
-msgid "subject"
-msgstr "perihal"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "Sali_n"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:680
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "to"
-msgstr "to"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "Salin Alamat Sur_el"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.
-#: ../src/engine/imap-db/imap-db-account.vala:699
-msgid "me"
-msgstr "me"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "Sa_lin Tautan"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:535
-msgid "Drafts | Draft"
-msgstr "Draf"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
+msgstr "Pilih _Pesan"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:540
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "Sent | Sent Mail | Sent Email | Sent E-Mail | Surat Keluar | Terkirim"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Pilih Semu_a"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "Per_iksa"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr "Tautan ini nampaknya menuju ke"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
+msgstr "tapi sebenarnya ke"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
+msgstr " (Tak valid?)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
+msgstr "_Simpan Gambar Sebagai..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_Simpan Sebagai..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "Simpan Semua _Lampiran..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] "Simpan Semua _Lampiran..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "Balas ke Semu_a"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "Tan_dai sudah Dibaca"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "Tan_dai belum Dibaca"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:545
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
+msgstr "Tandai Belum Dibaca Dari _Sini"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "Lihat Su_mber"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "Gagal membuka penyunting teks utama."
+
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr "%s - Penyidik Percakapan"
+
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Disimpan"
+
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Menyimpan"
+
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Galat saat menyimpan"
+
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Pesan Baru"
+
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
+"lampiran|melampirkan|dilampirkan|terlampir|attach|attaching|attaches|attachme"
+"nt|attachments|attached|enclose|enclosed|enclosing|encloses|enclosure|enclosu"
+"res"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:550
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Trash | Rubbish | Rubbish Bin | Sampah | Tong Sampah | Tempat Sampah"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Anda mau membuang pesan ini?"
 
-#. / 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:168
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %-e %b %Y pada %-H:%M"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Kirim pesan dengan subjek dan isi kosong?"
 
-#. / 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:174
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "Pada %1$s, %2$s menulis:"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Kirim pesan dengan subjek kosong?"
 
-#. / 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:181
-#, c-format
-msgid "%s wrote:"
-msgstr "%s menulis:"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Kirim pesan tanpa isi?"
 
-#. / 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:187
-#, c-format
-msgid "On %s:"
-msgstr "Pada %s:"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Kirim pesan tanpa lampiran?"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:216
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Pesan yang diteruskan --------"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Tak bisa menambah lampiran"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "From: %s\n"
-msgstr "Dari: %s\n"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "\"%s\" tidak ditemukan."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:221
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Perihal: %s\n"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" adalah map."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:222
-#, c-format
-msgid "Date: %s\n"
-msgstr "Tanggal: %s\n"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" adalah berkas kosong."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:225
-#, c-format
-msgid "To: %s\n"
-msgstr "Kepada: %s\n"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "\"%s\" tak bisa dibuka untuk dibaca."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:228
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Cc: %s\n"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "\"%s\" sudah dilampirkan untuk pengiriman."
+
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">Tak dapat menghapus akun</span>"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Kepada: "
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Cc: "
+
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Bcc: "
+
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
 msgstr ""
-"Jendela penyusun pesan dari akun ini sedang terbuka. Kirim atau buang pesan "
-"itu dan coba lagi."
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Tambah akun"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Pilih Warna"
+
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_Dari:"
+
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Mengirim..."
+
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i cocok"
+
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i cocok (dilipat)"
+
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "tak ditemukan"
+
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_OK"
+
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "Ba_tal"
+
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Tutup"
+
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Buang"
+
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Buka"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Sunting akun"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Cetak..."
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Hapus akun"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "Singki_rkan"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Silakan tunggu sementara Geary memvalidasi akun Anda."
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Pertahankan"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Koneksi Tak Terpercaya"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Cari kata kunci pada semua surat dalam akun (Ctrl+S)"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "Sel_alu Percayai Server Ini"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Mengindeks akun %s"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "_Percayai Server Ini"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "_Jangan Percayai Server Ini"
+#~ msgid "Geary Mail"
+#~ msgstr "Surat Geary"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "Tak _Jadi"
+#~ msgid "Send and receive email"
+#~ msgstr "Kirim dan terima surel"
 
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "Jadi _Lagi"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Surel;Surat;Email;E-mail;Mail;"
 
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "Po_tong"
+#~ msgid "Compose Message"
+#~ msgstr "Susun Pesan"
 
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "Tem_pel"
+#~ msgid "Send by email"
+#~ msgstr "Kirim melalui surel"
 
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "K_iri"
+#~ msgid "Send files using Geary"
+#~ msgstr "Kirim berkas memakai Geary"
 
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "K_anan"
+#~ msgid "Copyright 2011-2014 Yorba Foundation"
+#~ msgstr "Hak Cipta 2011-2014 Yorba Foundation"
 
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "T_engah"
+#~ msgid "_Delete"
+#~ msgstr "_Hapus"
 
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Rata"
+#~ msgid "_Trash"
+#~ msgstr "_Tong Sampah"
 
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Tautan (Ctrl+L)"
+#~ msgid "Move conversation to trash (Delete, Backspace)"
+#~ msgstr "Pindahkan percakapan ke tong sampah (Delete, Backspace)"
 
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "_Warna"
+#~ msgid "Move conversations to trash (Delete, Backspace)"
+#~ msgstr "Pindahkan percakapan ke tong sampah (Delete, Backspace)"
 
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Lebih banyak opsi"
+#~ msgid "_Donate"
+#~ msgstr "_Sumbang"
 
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Kutip teks (Ctrl+])"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Anda ingin membuang pesan yang belum disimpan?"
 
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Tidak mengutip teks (Ctrl+[)"
+#~ msgid "Please enter your password"
+#~ msgstr "Harap masukkan sandi Anda"
 
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Tanpa format (Ctrl+Space)"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Tak dapat menghapus akun</span> "
 
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Tempel Dengan _Format"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Tebal (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Miring (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Garis bawah (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Coret (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "_Rich Text"
-
-#: ../ui/composer.glade.h:23
-msgid "Lar_ge"
-msgstr "_Besar"
-
-#: ../ui/composer.glade.h:24
-msgid "Large"
-msgstr "Besar"
-
-#: ../ui/composer.glade.h:25
-msgid "_Medium"
-msgstr "_Sedang"
-
-#: ../ui/composer.glade.h:26
-msgid "Medium"
-msgstr "Sedang"
-
-#: ../ui/composer.glade.h:27
-msgid "_Small"
-msgstr "_Kecil"
-
-#: ../ui/composer.glade.h:28
-msgid "Small"
-msgstr "Kecil"
-
-#: ../ui/composer.glade.h:29
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
-
-#: ../ui/composer.glade.h:30
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: ../ui/composer.glade.h:31
-msgid "S_erif"
-msgstr "S_erif"
-
-#: ../ui/composer.glade.h:32
-msgid "Serif"
-msgstr "Serif"
-
-#: ../ui/composer.glade.h:33
-msgid "_Fixed Width"
-msgstr "Lebar _Tetap"
-
-#: ../ui/composer.glade.h:34
-msgid "Fixed Width"
-msgstr "Lebar Tetap"
-
-#: ../ui/composer.glade.h:35
-msgid "Detach"
-msgstr "Copot"
-
-#: ../ui/composer.glade.h:36
-msgid "_Send"
-msgstr "_Kirim"
-
-#: ../ui/composer.glade.h:37
-msgid "Send"
-msgstr "Kirim"
-
-#: ../ui/composer.glade.h:38
-msgid "_Attach File"
-msgstr "L_ampirkan Berkas"
-
-#: ../ui/composer.glade.h:39
-msgid "Attach File"
-msgstr "Lampirkan Berkas"
-
-#: ../ui/composer.glade.h:40
-msgid "_Include Original Attachments"
-msgstr "Sertakan Lampiran Asl_i"
-
-#: ../ui/composer.glade.h:41
-msgid "Include Original Attachments"
-msgstr "Sertakan Lampiran Asli"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:43
-msgid "_To"
-msgstr "_Ke"
-
-#: ../ui/composer.glade.h:44
-msgid "_Cc"
-msgstr "_Cc"
-
-#: ../ui/composer.glade.h:45
-msgid "_Subject"
-msgstr "_Perihal"
-
-#: ../ui/composer.glade.h:46
-msgid "_Bcc"
-msgstr "_Bcc"
-
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:48
-msgid "From"
-msgstr "Dari"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Jendela penyusun pesan dari akun ini sedang terbuka. Kirim atau buang pesan "
+#~ "itu dan coba lagi."
 
-#: ../ui/composer.glade.h:49
-msgid "Drop files here"
-msgstr "Jatuhkan berkas di sini"
+#~ msgid "Add account"
+#~ msgstr "Tambah akun"
 
-#: ../ui/composer.glade.h:50
-msgid "To add them as attachments"
-msgstr "Untuk menambahkan mereka sebagai lampiran"
+#~ msgid "Edit account"
+#~ msgstr "Sunting akun"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Cari:"
+#~ msgid "Remove account"
+#~ msgstr "Hapus akun"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "Se_belumnya"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Silakan tunggu sementara Geary memvalidasi akun Anda."
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "Se_lanjutnya"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Koneksi Tak Terpercaya"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "Peka huruf besar ke_cil"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "Sel_alu Percayai Server Ini"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "label"
+#~ msgid "_Trust This Server"
+#~ msgstr "_Percayai Server Ini"
 
-#: ../ui/login.glade.h:1
-msgid "Password"
-msgstr "Sandi"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "_Jangan Percayai Server Ini"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "Ala_mat surel"
+#~ msgid "_Undo"
+#~ msgstr "Tak _Jadi"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Sandi"
+#~ msgid "_Redo"
+#~ msgstr "Jadi _Lagi"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "_Layanan"
+#~ msgid "Cu_t"
+#~ msgstr "Po_tong"
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "N_ama"
+#~ msgid "_Paste"
+#~ msgstr "Tem_pel"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "Nama pangg_ilan"
+#~ msgid "_Left"
+#~ msgstr "K_iri"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Kantor, Rumah, dsb."
+#~ msgid "_Right"
+#~ msgstr "K_anan"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_Simpan surat terkirim"
+#~ msgid "_Center"
+#~ msgstr "T_engah"
 
-#: ../ui/login.glade.h:10
-msgid "IMAP settings"
-msgstr "Pengaturan IMAP"
+#~ msgid "_Justify"
+#~ msgstr "_Rata"
 
-#: ../ui/login.glade.h:11
-msgid "Se_rver"
-msgstr "Se_rver"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Tautan (Ctrl+L)"
 
-#: ../ui/login.glade.h:12
-msgid "P_ort"
-msgstr "P_ort"
+#~ msgid "C_olor"
+#~ msgstr "_Warna"
 
-#: ../ui/login.glade.h:13
-msgid "Ser_ver"
-msgstr "Ser_ver"
+#~ msgid "More options"
+#~ msgstr "Lebih banyak opsi"
 
-#: ../ui/login.glade.h:14
-msgid "Por_t"
-msgstr "Por_t"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Kutip teks (Ctrl+])"
 
-#: ../ui/login.glade.h:15
-msgid "SMTP settings"
-msgstr "Pengaturan SMTP"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Tidak mengutip teks (Ctrl+[)"
 
-#: ../ui/login.glade.h:16
-msgid "User_name"
-msgstr "_Nama pengguna"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Tanpa format (Ctrl+Space)"
 
-#: ../ui/login.glade.h:17
-msgid "Pass_word"
-msgstr "San_di:"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Tempel Dengan _Format"
 
-#: ../ui/login.glade.h:18
-msgid "SMTP username"
-msgstr "Nama pengguna SMTP"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Tebal (Ctrl+B)"
 
-#: ../ui/login.glade.h:19
-msgid "SMTP password"
-msgstr "Sandi SMTP"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Miring (Ctrl+I)"
 
-#: ../ui/login.glade.h:20
-msgid "_Username"
-msgstr "Nama pengg_una"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Garis bawah (Ctrl+U)"
 
-#: ../ui/login.glade.h:21
-msgid "IMAP username"
-msgstr "Nama pengguna IMAP"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Coret (Ctrl+K)"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP password"
-msgstr "Sandi IMAP"
+#~ msgid "_Rich Text"
+#~ msgstr "_Rich Text"
 
-#: ../ui/login.glade.h:23
-msgid "Encr_yption"
-msgstr "Enkrip_si"
+#~ msgid "Lar_ge"
+#~ msgstr "_Besar"
 
-#: ../ui/login.glade.h:24
-msgid "Encrypt_ion"
-msgstr "Enkrips_i"
+#~ msgid "Large"
+#~ msgstr "Besar"
 
-#: ../ui/login.glade.h:26
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "_Medium"
+#~ msgstr "_Sedang"
 
-#: ../ui/login.glade.h:27
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "Medium"
+#~ msgstr "Sedang"
 
-#: ../ui/login.glade.h:28
-msgid "No authentication re_quired"
-msgstr "Otenti_kasi tidak dibutuhkan"
+#~ msgid "_Small"
+#~ msgstr "_Kecil"
 
-#: ../ui/login.glade.h:29
-msgid "Use IMAP cre_dentials"
-msgstr "Pakai kre_densial IMAP"
+#~ msgid "Small"
+#~ msgstr "Kecil"
 
-#: ../ui/login.glade.h:30
-msgid "Storage"
-msgstr "Penyimpanan"
+#~ msgid "S_ans Serif"
+#~ msgstr "S_ans Serif"
 
-#: ../ui/login.glade.h:31
-msgid "_Download mail"
-msgstr "Un_duh surat"
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../ui/login.glade.h:32 ../ui/preferences.glade.h:6
-msgid "Composer"
-msgstr "Penyusun"
+#~ msgid "S_erif"
+#~ msgstr "S_erif"
 
-#: ../ui/login.glade.h:33
-msgid "Save dra_fts on server"
-msgstr "Simpan dra_f pada server"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../ui/login.glade.h:34
-msgid "Si_gn emails:"
-msgstr "Tandatan_gani surel:"
+#~ msgid "_Fixed Width"
+#~ msgstr "Lebar _Tetap"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "Kredensial SMTP"
+#~ msgid "Fixed Width"
+#~ msgstr "Lebar Tetap"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username:"
-msgstr "Nama pengguna:"
+#~ msgid "Detach"
+#~ msgstr "Copot"
 
-#: ../ui/password-dialog.glade.h:3
-msgid "Password:"
-msgstr "Sandi:"
+#~ msgid "_Send"
+#~ msgstr "_Kirim"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Ingat sandi"
+#~ msgid "Send"
+#~ msgstr "Kirim"
 
-#: ../ui/preferences.glade.h:1
-msgid "Preferences"
-msgstr "Preferensi"
+#~ msgid "_Attach File"
+#~ msgstr "L_ampirkan Berkas"
 
-#: ../ui/preferences.glade.h:3
-msgid "Reading"
-msgstr "Membaca"
+#~ msgid "Attach File"
+#~ msgstr "Lampirkan Berkas"
 
-#: ../ui/preferences.glade.h:4
-msgid "_Automatically select next message"
-msgstr "Otom_atis pilih pesan selanjutnya"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "Sertakan Lampiran Asl_i"
 
-#: ../ui/preferences.glade.h:5
-msgid "_Display conversation preview"
-msgstr "_Tampilkan pratinjau percakapan"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Sertakan Lampiran Asli"
 
-#: ../ui/preferences.glade.h:7
-msgid "Enable _spell checking"
-msgstr "Fung_sikan pemeriksa ejaan"
+#~ msgid "_To"
+#~ msgstr "_Ke"
 
-#: ../ui/preferences.glade.h:8
-msgid "Notifications"
-msgstr "Pemberitahuan"
+#~ msgid "_Cc"
+#~ msgstr "_Cc"
 
-#: ../ui/preferences.glade.h:9
-msgid "_Play notification sounds"
-msgstr "Bunyikan suara _pemberitahuan"
+#~ msgid "_Subject"
+#~ msgstr "_Perihal"
 
-#: ../ui/preferences.glade.h:10
-msgid "Show _notifications for new mail"
-msgstr "Tu_njukkan pemberitahuan bagi surat baru"
+#~ msgid "_Bcc"
+#~ msgstr "_Bcc"
 
-#: ../ui/preferences.glade.h:11
-msgid "Notify of new mail at start_up"
-msgstr "Beritahu adanya surel baru saat awal m_ula"
+#~ msgid "From"
+#~ msgstr "Dari"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Anda yakin ingin menghapus akun ini?</"
-"span>"
+#~ msgid "Drop files here"
+#~ msgstr "Jatuhkan berkas di sini"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Semua surel terkait akun ini akan dihapus dari komputer Anda. Ini tidak "
-"mempengaruhi surel pada server."
+#~ msgid "To add them as attachments"
+#~ msgstr "Untuk menambahkan mereka sebagai lampiran"
+
+#~ msgid "Find:"
+#~ msgstr "Cari:"
+
+#~ msgid "_Previous"
+#~ msgstr "Se_belumnya"
+
+#~ msgid "_Next"
+#~ msgstr "Se_lanjutnya"
+
+#~ msgid "_Case sensitive"
+#~ msgstr "Peka huruf besar ke_cil"
+
+#~ msgid "label"
+#~ msgstr "label"
+
+#~ msgid "Password"
+#~ msgstr "Sandi"
+
+#~ msgid "E_mail address"
+#~ msgstr "Ala_mat surel"
+
+#~ msgid "_Password"
+#~ msgstr "_Sandi"
+
+#~ msgid "S_ervice"
+#~ msgstr "_Layanan"
+
+#~ msgid "N_ame"
+#~ msgstr "N_ama"
+
+#~ msgid "N_ickname"
+#~ msgstr "Nama pangg_ilan"
+
+#~ msgid "Work, Home, etc."
+#~ msgstr "Kantor, Rumah, dsb."
+
+#~ msgid "_Save sent mail"
+#~ msgstr "_Simpan surat terkirim"
+
+#~ msgid "IMAP settings"
+#~ msgstr "Pengaturan IMAP"
+
+#~ msgid "Se_rver"
+#~ msgstr "Se_rver"
+
+#~ msgid "P_ort"
+#~ msgstr "P_ort"
+
+#~ msgid "Ser_ver"
+#~ msgstr "Ser_ver"
+
+#~ msgid "Por_t"
+#~ msgstr "Por_t"
+
+#~ msgid "SMTP settings"
+#~ msgstr "Pengaturan SMTP"
+
+#~ msgid "User_name"
+#~ msgstr "_Nama pengguna"
+
+#~ msgid "Pass_word"
+#~ msgstr "San_di:"
+
+#~ msgid "SMTP username"
+#~ msgstr "Nama pengguna SMTP"
+
+#~ msgid "SMTP password"
+#~ msgstr "Sandi SMTP"
+
+#~ msgid "_Username"
+#~ msgstr "Nama pengg_una"
+
+#~ msgid "IMAP username"
+#~ msgstr "Nama pengguna IMAP"
+
+#~ msgid "IMAP password"
+#~ msgstr "Sandi IMAP"
+
+#~ msgid "Encr_yption"
+#~ msgstr "Enkrip_si"
+
+#~ msgid "Encrypt_ion"
+#~ msgstr "Enkrips_i"
+
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
+
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
+
+#~ msgid "No authentication re_quired"
+#~ msgstr "Otenti_kasi tidak dibutuhkan"
+
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Pakai kre_densial IMAP"
+
+#~ msgid "Storage"
+#~ msgstr "Penyimpanan"
+
+#~ msgid "_Download mail"
+#~ msgstr "Un_duh surat"
+
+#~ msgid "Composer"
+#~ msgstr "Penyusun"
+
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Simpan dra_f pada server"
+
+#~ msgid "Si_gn emails:"
+#~ msgstr "Tandatan_gani surel:"
+
+#~ msgid "SMTP Credentials"
+#~ msgstr "Kredensial SMTP"
+
+#~ msgid "Username:"
+#~ msgstr "Nama pengguna:"
+
+#~ msgid "Password:"
+#~ msgstr "Sandi:"
+
+#~ msgid "_Remember password"
+#~ msgstr "_Ingat sandi"
+
+#~ msgid "Preferences"
+#~ msgstr "Preferensi"
+
+#~ msgid "Reading"
+#~ msgstr "Membaca"
+
+#~ msgid "_Automatically select next message"
+#~ msgstr "Otom_atis pilih pesan selanjutnya"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Tampilkan pratinjau percakapan"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Fung_sikan pemeriksa ejaan"
+
+#~ msgid "Notifications"
+#~ msgstr "Pemberitahuan"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "Bunyikan suara _pemberitahuan"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Tu_njukkan pemberitahuan bagi surat baru"
+
+#~ msgid "Notify of new mail at start_up"
+#~ msgstr "Beritahu adanya surel baru saat awal m_ula"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Anda yakin ingin menghapus akun "
+#~ "ini?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Semua surel terkait akun ini akan dihapus dari komputer Anda. Ini tidak "
+#~ "mempengaruhi surel pada server."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Nama panggilan:"
+#~ msgid "Nickname:"
+#~ msgstr "Nama panggilan:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Alamat surel:"
+#~ msgid "Email address:"
+#~ msgstr "Alamat surel:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary upgrade in progress."
-msgstr "Peningkatan Geary sedang berlangsung."
+#~ msgid "Geary upgrade in progress."
+#~ msgstr "Peningkatan Geary sedang berlangsung."
diff --git a/po/it.po b/po/it.po
index 543ce95..f85c94f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -16,454 +16,431 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-06-01 05:11+0000\n"
-"PO-Revision-Date: 2015-06-01 13:18+0200\n"
-"Last-Translator: Federico Bruni <fede inventati org>\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:06+0000\n"
+"Last-Translator: Federico Bruni <Unknown>\n"
 "Language-Team: Italiano <gnome-it-list gnome org>\n"
-"Language: it\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 2.91.7\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Client di posta"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary Mail"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Invia e ricevi email"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Mail;Posta;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Componi messaggio"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Invia per email"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Invia file tramite Geary"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Salva"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:54+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: it\n"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "A_ggiungi"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Bozze | Bozza | Drafts | Draft"
 
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "Indirizzi aggiuntivi per %s"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
+"Inviata | Posta inviata | Email inviate | Sent | Sent Mail | Sent Email | "
+"Sent E-Mail"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Account"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
+"Indesiderata | Posta indesiderata | Junk | Spam | Junk Mail | Junk Email | "
+"Junk E-Mail | Bulk Mail | Bulk Email | Bulk E-Mail"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Nome Cognome"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Cestino | Trash | Rubbish | Rubbish Bin"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Welcome to Geary."
-msgstr "Benvenuto in Geary."
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr "Archivio | Archivi | Archive | Archives"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Enter your account information to get started."
-msgstr "Inserire le informazioni sul proprio account per iniziare."
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Posta in arrivo"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "2 weeks back"
-msgstr "2 settimane fa"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Bozze"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "1 month back"
-msgstr "1 mese fa"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Posta inviata"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "3 months back"
-msgstr "3 mesi fa"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Speciale"
 
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "6 months back"
-msgstr "6 mesi fa"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Importante"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "1 year back"
-msgstr "1 anno fa"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Tutta la posta"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-msgid "2 years back"
-msgstr "2 anni fa"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Indesiderata"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-msgid "4 years back"
-msgstr "4 anni fa"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Cestino"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "Everything"
-msgstr "Tutto"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Posta in uscita"
 
-#: ../src/client/accounts/add-edit-page.vala:280
-msgid "Edit"
-msgstr "Modifica"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Cerca"
 
-#: ../src/client/accounts/add-edit-page.vala:282
-msgid "Preview"
-msgstr "Anteprima"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Archivio"
 
-#: ../src/client/accounts/add-edit-page.vala:723
-msgid "Remem_ber passwords"
-msgstr "Ric_orda le password"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Nulla"
 
-#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "Ric_orda password"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:764
-msgid "Unable to validate:\n"
-msgstr "Impossibile convalidare:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:766
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Soprannome dell'account non valido.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:769
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; Indirizzo email già presente in Geary.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:773
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; Errore di connessione a IMAP.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:776
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; Nome utente o password IMAP errati.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Altro"
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; Errore di connessione a SMTP.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "allegato"
 
-#: ../src/client/accounts/add-edit-page.vala:782
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; Nome utente o password SMTP errati.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "ccn"
 
-#: ../src/client/accounts/add-edit-page.vala:786
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Errore di connessione.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "corpo"
 
-#: ../src/client/accounts/add-edit-page.vala:790
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Nome utente o password errati.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "cc"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011-2015 Yorba Foundation"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "da"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Visita il sito web di Yorba"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "oggetto"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Avvia Geary nascondendo la finestra principale"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "a"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Emette informazioni di debug"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "me"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Registra il monitoraggio delle conversazioni"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(nessun oggetto)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Registra deserializzazione di rete"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a %-e %b %Y alle %-k:%M"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Registra attività di rete"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "Il giorno %1$s, %2$s ha scritto:"
 
-#. / 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 "Registra la coda di eventi IMAP"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s ha scritto:"
 
-#. / 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 "Registra serializzazione di rete"
+#. / 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:234
+msgid "On %s:"
+msgstr "Il giorno %s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Registra attività periodiche"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Messaggio inoltrato ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Registra le ricerche nel database (genera numerosi messaggi)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Da: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Registra la normalizzazione cartella"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Oggetto: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Consente l'ispezione WebView"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Data: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Revoca tutti i certificati del server con avvisi TLS"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "A: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Visualizza versione programma"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Cc: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Usare %s per aprire una nuova finestra di composizione"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "nulla"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Inviare commenti, suggerimenti e segnalazioni di bug a:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Client di posta"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Analisi delle opzioni a riga di comando non riuscita: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "Copyright 2011-2015 Yorba Foundation"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Opzione a riga di comando «%s» non riconosciuta\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Visita il sito web di Yorba"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:61
 msgid "Delete conversation"
 msgstr "Elimina conversazione"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Elimina conversazione (Maiusc+Canc)"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Elimina conversazioni (Maiusc+Canc)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:67
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Sposta la conversazione nel cestino (Canc, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:68
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "Sposta le conversazioni nel cestino (Canc, Backspace)"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Archivia"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Archivia conversazione (A)"
 
-#: ../src/client/application/geary-controller.vala:75
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Archivia conversazioni (A)"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Segna come i_ndesiderata"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Segna come non i_ndesiderata"
 
-#: ../src/client/application/geary-controller.vala:81
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Segna conversazione"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Segna conversazioni"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Aggiungi etichetta alla conversazione"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Aggiungi etichetta alle conversazioni"
 
-#: ../src/client/application/geary-controller.vala:85
-#: ../src/client/application/geary-controller.vala:436
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Sposta conversazione"
 
-#: ../src/client/application/geary-controller.vala:86
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Sposta conversazioni"
 
-#: ../src/client/application/geary-controller.vala:373
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "A_ccount"
 
-#: ../src/client/application/geary-controller.vala:378
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Preferenze"
 
-#: ../src/client/application/geary-controller.vala:382
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "A_iuto"
 
-#: ../src/client/application/geary-controller.vala:386
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "I_nformazioni"
 
-#: ../src/client/application/geary-controller.vala:390
-msgid "_Donate"
-msgstr "_Donazione"
-
-#: ../src/client/application/geary-controller.vala:394
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Chiudi"
 
-#: ../src/client/application/geary-controller.vala:399
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Segna come..."
 
-#: ../src/client/application/geary-controller.vala:405
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Segna come _letto"
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Segna come _non letto"
 
-#: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Speciale"
 
-#: ../src/client/application/geary-controller.vala:422
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "_Non speciale"
 
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Aggiungi etichetta"
 
-#: ../src/client/application/geary-controller.vala:433
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Etichetta"
 
-#: ../src/client/application/geary-controller.vala:437
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Sposta"
 
-#: ../src/client/application/geary-controller.vala:441
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Componi un nuovo messaggio (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:445
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Rispondi"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Rispondi (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:450
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "R_ispondi a tutti"
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Rispondi a tutti (Ctrl+Maiusc+R, Maiusc+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Inoltra"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Inoltra (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:496
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr "Svuota"
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr "Svuota la cartella Indesiderata o Cestino"
 
-#: ../src/client/application/geary-controller.vala:501
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr "Svuota _Indesiderata…"
 
-#: ../src/client/application/geary-controller.vala:505
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr "Svuota _Cestino…"
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:538
+#: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
 msgstr "Attiva/Disattiva la barra di ricerca"
 
-#: ../src/client/application/geary-controller.vala:752
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Impossibile salvare l'eccezione di fiducia nel server"
 
-#: ../src/client/application/geary-controller.vala:989
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Le impostazioni non sono sicure"
 
-#: ../src/client/application/geary-controller.vala:990
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -473,17 +450,17 @@ msgstr ""
 "che nome utente e password potrebbero essere letti da altre persone sulla "
 "rete. Si è sicuri di volere ciò?"
 
-#: ../src/client/application/geary-controller.vala:991
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "Co_ntinua"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Errore durante l'invio dell'email"
 
-#: ../src/client/application/geary-controller.vala:1070
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -491,14 +468,12 @@ msgstr ""
 "Geary ha trovato un errore durante l'invio dell'email. Se il problema "
 "persiste, eliminare manualmente l'email dalla cartella della posta in uscita."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Errore durante il salvataggio dell'email inviata"
 
-#: ../src/client/application/geary-controller.vala:1075
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -507,20 +482,15 @@ msgstr ""
 "messaggio resterà nella cartella della posta in uscita finché non viene "
 "eliminato."
 
-#: ../src/client/application/geary-controller.vala:1144
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Etichette"
 
-#. 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:1156
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Impossibile aprire il database per %s"
 
-#: ../src/client/application/geary-controller.vala:1157
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -542,24 +512,22 @@ msgstr ""
 "uscire.\n"
 "\n"
 "La ricostruzione del database eliminerà tutta la posta locale, compresi gli "
-"allegati. <b>Tale operazione non ha effetti sulla posta presente sul server."
-"</b>"
+"allegati. <b>Tale operazione non ha effetti sulla posta presente sul "
+"server.</b>"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "_Ricostruisci"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "_Esci"
 
-#: ../src/client/application/geary-controller.vala:1168
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Impossibile ricostruire il database per «%s»"
 
-#: ../src/client/application/geary-controller.vala:1169
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -569,17 +537,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1191
-#: ../src/client/application/geary-controller.vala:1201
-#: ../src/client/application/geary-controller.vala:1212
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Impossibile aprire la posta in arrivo di %s"
 
-#: ../src/client/application/geary-controller.vala:1192
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -597,7 +561,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1202
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -611,7 +575,7 @@ msgstr ""
 "\n"
 "Si consiglia di installare l'ultima versione di Geary e riprovare."
 
-#: ../src/client/application/geary-controller.vala:1213
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -623,27 +587,29 @@ msgstr ""
 "\n"
 "Controllare la connessione di rete e riavviare Geary."
 
-#: ../src/client/application/geary-controller.vala:1721
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "Informazioni su %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1724
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
-msgstr "Daniele Napolitano, Federico Bruni"
+msgstr ""
+"Daniele Napolitano, Federico Bruni\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Federico Bruni https://launchpad.net/~fede-f";
 
-#: ../src/client/application/geary-controller.vala:1990
+#: ../src/client/application/geary-controller.vala:1976
 msgid "Undo move (Ctrl+Z)"
 msgstr "Annulla lo spostamento (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2000
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Sicuro di voler aprire «%s»?"
 
-#: ../src/client/application/geary-controller.vala:2001
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -651,300 +617,530 @@ msgstr ""
 "Gli allegati possono danneggiare il sistema se aperti. Aprire solo file "
 "provenienti da fonti fidate."
 
-#: ../src/client/application/geary-controller.vala:2002
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "_Non chiederlo più"
 
-#: ../src/client/application/geary-controller.vala:2020
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Il file «%s» esiste già. Sostituirlo?"
 
-#: ../src/client/application/geary-controller.vala:2022
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "Il file esiste già in «%s».  Sostituendolo il suo contenuto sarà "
 "sovrascritto."
 
-#: ../src/client/application/geary-controller.vala:2025
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2323
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Chiudere le bozze aperte?"
 
-#: ../src/client/application/geary-controller.vala:2453
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr "Svuotare tutti i messaggi dalla cartella %s?"
 
-#: ../src/client/application/geary-controller.vala:2454
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr "Saranno eliminati i messaggi sia da Geary sia dal server di posta."
 
-#: ../src/client/application/geary-controller.vala:2455
+#: ../src/client/application/geary-controller.vala:2441
 msgid "This cannot be undone."
 msgstr "Impossibile annullare questa azione."
 
-#: ../src/client/application/geary-controller.vala:2456
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr "Svuota %s"
 
-#: ../src/client/application/geary-controller.vala:2473
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 msgid "Error emptying %s"
 msgstr "Errore nello svuotare %s"
 
-#: ../src/client/application/geary-controller.vala:2503
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Eliminare permanentemente questo messaggio?"
 msgstr[1] "Eliminare permanentemente questi messaggi?"
 
-#: ../src/client/application/geary-controller.vala:2505
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Elimina"
 
-#: ../src/client/application/geary-controller.vala:2536
+#: ../src/client/application/geary-controller.vala:2522
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Annulla l'archiviazione (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2551
+#: ../src/client/application/geary-controller.vala:2537
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Annulla lo spostamento nel cestino (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2604
+#: ../src/client/application/geary-controller.vala:2590
 msgid "Undo (Ctrl+Z)"
 msgstr "Annulla (Ctrl+Z)"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i corrispondenza"
-msgstr[1] "%i corrispondenze"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Avvia Geary nascondendo la finestra principale"
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i corrispondenza (ricomincia dall'inizio)"
-msgstr[1] "%i corrispondenze (ricomincia dall'inizio)"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Emette informazioni di debug"
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "non trovato"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Registra il monitoraggio delle conversazioni"
 
-#: ../src/client/components/main-window.vala:430
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Registra deserializzazione di rete"
 
-#: ../src/client/components/search-bar.vala:10
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Cerca"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Registra attività di rete"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:25
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Cerca le parole chiave in tutta la posta dell'account (Ctrl+S)"
+#. / 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 "Registra la coda di eventi IMAP"
 
-#: ../src/client/components/search-bar.vala:118
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indicizzazione dell'account %s"
+#. / 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 "Registra serializzazione di rete"
 
-#: ../src/client/components/search-bar.vala:129
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Cerca l'account %s"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Registra attività periodiche"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Invio..."
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Registra le ricerche nel database (genera numerosi messaggi)"
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_OK"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Registra la normalizzazione cartella"
 
-#: ../src/client/components/stock.vala:19
-#: ../ui/edit_alternate_emails.glade.h:3 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "A_nnulla"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Consente l'ispezione WebView"
 
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Chiudi"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Revoca tutti i certificati del server con avvisi TLS"
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Scarta"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Visualizza versione programma"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Apri"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Usare %s per aprire una nuova finestra di composizione"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "Stam_pa..."
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Inviare commenti, suggerimenti e segnalazioni di bug a:"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Rimuovi"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Analisi delle opzioni a riga di comando non riuscita: %s\n"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "Seleziona _tutto"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Opzione a riga di comando «%s» non riconosciuta\n"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Conserva"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Nuovi messaggi"
 
-#: ../src/client/composer/composer-widget.vala:73
-msgid "Saved"
-msgstr "Salvato"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d nuovo messaggio"
+msgstr[1] "%d nuovi messaggi"
 
-#: ../src/client/composer/composer-widget.vala:74
-msgid "Saving"
-msgstr "Salvataggio"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d nuovo messaggio in totale"
+msgstr[1] "%s, %d nuovi messaggi in totale"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "Error saving"
-msgstr "Errore durante il salvataggio"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d altro nuovo messaggio per %s)"
+msgstr[1] ""
+"%s\n"
+"(%d altri nuovi messaggi per %s)"
 
-#: ../src/client/composer/composer-widget.vala:76
-msgid "Press Backspace to delete quote"
-msgstr "Premere Backspace per eliminare la citazione"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Apri"
 
-#: ../src/client/composer/composer-widget.vala:77
-msgid "New Message"
-msgstr "Nuovo messaggio"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Io"
 
-#. A 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:138
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr "Connessione non sicura: %s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
+"Impossibile verificare l'identità del server di posta %s presso %s:%u."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
 msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures|allegato|allegati|allego|allega|"
-"allegare|allegando|includo"
+"Scegliendo le opzioni «Fidati di questo server» o «Fidati sempre di questo "
+"server» nome utente e password potrebbero essere trasmessi in modo non "
+"sicuro."
 
-#: ../src/client/composer/composer-widget.vala:1102
-#: ../src/client/composer/composer-widget.vala:1106
-msgid "Do you want to discard this message?"
-msgstr "Scartare questo messaggio?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"Scegliendo l'opzione «Non fidarti di questo server» Geary non accederà a "
+"questo server."
 
-#: ../src/client/composer/composer-widget.vala:1262
-msgid "Send message with an empty subject and body?"
-msgstr "Inviare il messaggio senza l'oggetto e il testo?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Geary non aggiungerà né aggiornerà questo account di posta."
 
-#: ../src/client/composer/composer-widget.vala:1264
-msgid "Send message with an empty subject?"
-msgstr "Inviare il messaggio senza un oggetto?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"Scegliendo l'opzione «Non fidarti di questo server» Geary smetterà di "
+"accedere a questo account."
 
-#: ../src/client/composer/composer-widget.vala:1266
-msgid "Send message with an empty body?"
-msgstr "Inviare il messaggio senza il testo?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr "Geary verrà chiuso se non ci sono altri account di posta aperti."
 
-#: ../src/client/composer/composer-widget.vala:1268
-msgid "Send message without an attachment?"
-msgstr "Inviare il messaggio senza un allegato?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Contattare il proprio amministratore di sistema o il fornitore di servizi "
+"email per qualsiasi domanda su tali questioni."
 
-#: ../src/client/composer/composer-widget.vala:1530
-msgid "Cannot add attachment"
-msgstr "Impossibile aggiungere l'allegato"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
+"Il certificato del server non è firmato da alcuna authority conosciuta."
 
-#: ../src/client/composer/composer-widget.vala:1541
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "«%s» non può essere trovato."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr "L'identità del server non corrisponde all'identità del certificato"
 
-#: ../src/client/composer/composer-widget.vala:1548
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "«%s» è una cartella."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Il certificato del server è scaduto"
 
-#: ../src/client/composer/composer-widget.vala:1555
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "«%s» è un file vuoto."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "Il certificato del server non è stato attivato"
 
-#: ../src/client/composer/composer-widget.vala:1569
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "«%s» non può essere aperto per la lettura."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "Il certificato del server è stato revocato e non è più valido"
 
-#: ../src/client/composer/composer-widget.vala:1576
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "«%s» è già allegato per l'invio."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "Il certificato del server è considerato non sicuro"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1585
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr ""
+"Si è verificato un errore nell'elaborazione del certificato del server"
 
-#: ../src/client/composer/composer-widget.vala:1645
-msgid "To: "
-msgstr "A: "
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr "È richiesta la password dell'account email per continuare"
 
-#: ../src/client/composer/composer-widget.vala:1648
-msgid "Cc: "
-msgstr "Cc: "
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Scegli un file"
 
-#: ../src/client/composer/composer-widget.vala:1651
-msgid "Bcc: "
-msgstr "Ccn: "
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Allega"
 
-#: ../src/client/composer/composer-widget.vala:1654
-msgid "Reply-To: "
-msgstr "Rispondi a:"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr "Indirizzi aggiuntivi per %s"
 
-#: ../src/client/composer/composer-widget.vala:1887
-msgid "Select Color"
-msgstr "Seleziona colore"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Account"
 
-#. 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:2322
-#, c-format
-msgid "%1$s via %2$s"
-msgstr "%1$s via %2$s"
+#. / 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 "Nome Cognome"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2364
-msgid "_From:"
-msgstr "_Da:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Benvenuto in Geary."
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Io"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Inserire le informazioni sul proprio account per iniziare."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 settimane fa"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 mese fa"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 mesi fa"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 mesi fa"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 anno fa"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "2 anni fa"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "4 anni fa"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Tutto"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "Modifica"
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr "Anteprima"
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "Ric_orda le password"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "Ric_orda password"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Impossibile convalidare:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Soprannome dell'account non valido.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Indirizzo email già presente in Geary.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Errore di connessione a IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Nome utente o password IMAP errati.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Errore di connessione a SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; Nome utente o password SMTP errati.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Errore di connessione.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Nome utente o password errati.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Salva"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "A_ggiungi"
+
+#. / 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 "%l.%M %P"
+
+#. / 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 %-l.%M %P"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Adesso"
+
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "%dm fa"
+msgstr[1] "%dm fa"
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "%dh fa"
+msgstr[1] "%dh fa"
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Ieri"
+
+#. / 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
+msgid "%A"
+msgstr "%A"
+
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "byte"
+
+#: ../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/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d messaggio"
+msgstr[1] "%d messaggi"
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d non letto"
+msgstr[1] "%d non letti"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Posta in arrivo"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Cerca l'account %s"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d risultato"
+msgstr[1] "%d risultati"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "Nessuna conversazione selezionata."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "%u conversazione selezionata."
@@ -999,42 +1195,38 @@ msgid "Date:"
 msgstr "Data:"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "%u messaggio letto"
 msgstr[1] "%u messaggi letti"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr ""
 "Questo messaggio è stato inviato correttamente, ma non è stato possibile "
 "salvarlo in %s."
 
-#. Add a menu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Copia"
 
-#. Add a menu item for copying the address.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "Copia indirizzo _email"
 
-#. Add a menu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Copia co_llegamento"
 
-#. Select message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "Seleziona _messaggio"
 
-#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Seleziona _tutto"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "_Ispeziona"
@@ -1047,10 +1239,9 @@ msgstr "Questo collegamento sembra portare a"
 msgid "but actually goes to"
 msgstr "ma in realtà va in"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
-msgstr "(Non corretto?)"
+msgstr " (Non corretto?)"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1718
 msgid "_Save Image As..."
@@ -1070,12 +1261,10 @@ msgid_plural "Save All A_ttachments..."
 msgstr[0] "Salva a_llegato..."
 msgstr[1] "Salva a_llegati..."
 
-#. Reply to all on a message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "Rispondi a _tutti"
 
-#. Mark as read/unread.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "_Segna come letto"
@@ -1088,1071 +1277,622 @@ msgstr "_Segna come da leggere"
 msgid "Mark Unread From _Here"
 msgstr "Segna come non letto da _qui"
 
-#. Separator.
-#. View original message source.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "_Visualizza sorgente"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:378
-msgid "none"
-msgstr "nulla"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "Non è stato possibile aprire l'editor di testo predefinito."
 
 #: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s - Ispettore delle conversazioni"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Scegli un file"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Salvato"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Allega"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Salvataggio"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
-msgid "Untrusted Connection: %s"
-msgstr "Connessione non sicura: %s"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Errore durante il salvataggio"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
-msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr "Impossibile verificare l'identità del server di posta %s presso %s:%u."
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "Premere Backspace per eliminare la citazione"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
-msgid ""
-"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-"your username and password to be transmitted insecurely."
-msgstr ""
-"Scegliendo le opzioni «Fidati di questo server» o «Fidati sempre di questo "
-"server» nome utente e password potrebbero essere trasmessi in modo non "
-"sicuro."
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Nuovo messaggio"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-"server."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Scegliendo l'opzione «Non fidarti di questo server» Geary non accederà a "
-"questo server."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures|allegato|allegati|allego|allega|allegar"
+"e|allegando|includo"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
-msgid "Geary will not add or update this email account."
-msgstr "Geary non aggiungerà né aggiornerà questo account di posta."
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Scartare questo messaggio?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-"this account."
-msgstr ""
-"Scegliendo l'opzione «Non fidarti di questo server» Geary smetterà di "
-"accedere a questo account."
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Inviare il messaggio senza l'oggetto e il testo?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr "Geary verrà chiuso se non ci sono altri account di posta aperti."
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Inviare il messaggio senza un oggetto?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
-msgid ""
-"Contact your system administrator or email service provider if you have any "
-"question about these issues."
-msgstr ""
-"Contattare il proprio amministratore di sistema o il fornitore di servizi "
-"email per qualsiasi domanda su tali questioni."
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Inviare il messaggio senza il testo?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
-msgstr ""
-"Il certificato del server non è firmato da alcuna authority conosciuta."
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Inviare il messaggio senza un allegato?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
-msgid "The server's identity does not match the identity in the certificate"
-msgstr "L'identità del server non corrisponde all'identità del certificato"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Impossibile aggiungere l'allegato"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
-msgid "The server's certificate has expired"
-msgstr "Il certificato del server è scaduto"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "«%s» non può essere trovato."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
-msgid "The server's certificate has not been activated"
-msgstr "Il certificato del server non è stato attivato"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "«%s» è una cartella."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
-msgid "The server's certificate has been revoked and is now invalid"
-msgstr "Il certificato del server è stato revocato e non è più valido"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "«%s» è un file vuoto."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
-msgid "The server's certificate is considered insecure"
-msgstr "Il certificato del server è considerato non sicuro"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "«%s» non può essere aperto per la lettura."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
-msgid "An error has occurred processing the server's certificate"
-msgstr "Si è verificato un errore nell'elaborazione del certificato del server"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "«%s» è già allegato per l'invio."
 
-#. 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 "Geary requires your email password to continue"
-msgstr "È richiesta la password dell'account email per continuare"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. 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 messaggio"
-msgstr[1] "%d messaggi"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "A: "
 
-#. / 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 non letto"
-msgstr[1] "%d non letti"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Cc: "
 
-#. / 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/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Ccn: "
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Posta in arrivo"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "Rispondi a: "
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d risultato"
-msgstr[1] "%d risultati"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Seleziona colore"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Nuovi messaggi"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr "%1$s via %2$s"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d nuovo messaggio"
-msgstr[1] "%d nuovi messaggi"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_Da:"
 
-#: ../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 nuovo messaggio in totale"
-msgstr[1] "%s, %d nuovi messaggi in totale"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 altro nuovo messaggio per %s)"
-msgstr[1] ""
-"%s\n"
-"(%d altri nuovi messaggi per %s)"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Invio..."
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Apri"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i corrispondenza"
+msgstr[1] "%i corrispondenze"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i corrispondenza (ricomincia dall'inizio)"
+msgstr[1] "%i corrispondenze (ricomincia dall'inizio)"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "non trovato"
 
-#. / 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"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_OK"
 
-#. / 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"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "A_nnulla"
 
-#. / 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"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Chiudi"
 
-#. / 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"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Scarta"
 
-#. / 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"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Apri"
 
-#. / 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"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "Stam_pa..."
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Adesso"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Rimuovi"
 
-#: ../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "%dm fa"
-msgstr[1] "%dm fa"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Conserva"
 
-#: ../src/client/util/util-date.vala:171
-#, c-format
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "%dh fa"
-msgstr[1] "%dh fa"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Cerca le parole chiave in tutta la posta dell'account (Ctrl+S)"
 
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "Ieri"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Indicizzazione dell'account %s"
 
-#. / 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"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(nessun oggetto)"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary Mail"
 
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "byte"
+#~ msgid "Send and receive email"
+#~ msgstr "Invia e ricevi email"
 
-#: ../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Email;E-mail;Mail;Posta;"
 
-#: ../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#~ msgid "Compose Message"
+#~ msgstr "Componi messaggio"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#~ msgid "Send by email"
+#~ msgstr "Invia per email"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#~ msgid "Send files using Geary"
+#~ msgstr "Invia file tramite Geary"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#~ msgid "_Donate"
+#~ msgstr "_Donazione"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Impossibile rimuovere account</span> "
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Una finestra di composizione associata a questo account è attualmente "
+#~ "aperta. Inviare o rimuovere il messaggio e provare ancora."
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Altro"
+#~ msgid "Add account"
+#~ msgstr "Aggiungi account"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#~ msgid "Edit account"
+#~ msgstr "Modifica account"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#~ msgid "Remove account"
+#~ msgstr "Rimuovi account"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Posta in arrivo"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Attendere mentre Geary convalida l'account."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Bozze"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Connessione non sicura"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Posta inviata"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "Fidati _sempre di questo server"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Speciale"
+#~ msgid "_Trust This Server"
+#~ msgstr "_Fidati di questo server"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Importante"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "_Non fidarti di questo server"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Tutta la posta"
+#~ msgid "_Undo"
+#~ msgstr "_Annulla"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Indesiderata"
+#~ msgid "_Redo"
+#~ msgstr "_Ripeti"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Cestino"
+#~ msgid "Cu_t"
+#~ msgstr "_Taglia"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Posta in uscita"
+#~ msgid "_Paste"
+#~ msgstr "_Incolla"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Archivio"
+#~ msgid "_Left"
+#~ msgstr "_Sinistra"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-msgstr "Nulla"
+#~ msgid "_Right"
+#~ msgstr "_Destra"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-msgid "attachment"
-msgstr "allegato"
+#~ msgid "_Center"
+#~ msgstr "_Centrato"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
-msgstr "ccn"
+#~ msgid "_Justify"
+#~ msgstr "_Giustificato"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
-msgstr "corpo"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Collegamento (Ctrl+L)"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "cc"
-msgstr "cc"
+#~ msgid "C_olor"
+#~ msgstr "C_olore"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
-msgstr "da"
+#~ msgid "More options"
+#~ msgstr "Ulteriori opzioni"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-msgid "subject"
-msgstr "oggetto"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Cita il testo (Ctrl+])"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
-msgstr "a"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Rimuovi la citazione del testo (Ctrl+[)"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
-msgstr "me"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Rimuovi formattazione (Ctrl+Spazio)"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-msgid "Drafts | Draft"
-msgstr "Bozze | Bozza | Drafts | Draft"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Incolla _con formattazione"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr ""
-"Inviata | Posta inviata | Email inviate | Sent | Sent Mail | Sent Email | "
-"Sent E-Mail"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Grassetto (Ctrl+B)"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
-msgstr ""
-"Indesiderata | Posta indesiderata | Junk | Spam | Junk Mail | Junk Email | "
-"Junk E-Mail | Bulk Mail | Bulk Email | Bulk E-Mail"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Corsivo (Ctrl+I)"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Cestino | Trash | Rubbish | Rubbish Bin"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Sottolineato (Ctrl+U)"
 
-#. List of folder names to match for Archive, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
-msgid "Archive | Archives"
-msgstr "Archivio | Archivi | Archive | Archives"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Barrato (Ctrl+K)"
 
-#. / 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:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a %-e %b %Y alle %-k:%M"
+#~ msgid "_Rich Text"
+#~ msgstr "Testo _formattato"
 
-#. / 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:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "Il giorno %1$s, %2$s ha scritto:"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Mostra i campi estesi"
 
-#. / 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:228
-#, c-format
-msgid "%s wrote:"
-msgstr "%s ha scritto:"
+#~ msgctxt "Label"
+#~ msgid "Close and Save"
+#~ msgstr "Chiudi e salva"
 
-#. / 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:234
-#, c-format
-msgid "On %s:"
-msgstr "Il giorno %s:"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "Chiudi e salva"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Messaggio inoltrato ----------"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "Chiudi e salva"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "Da: %s\n"
+#~ msgctxt "Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Chiudi e scarta"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Oggetto: %s\n"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Chiudi e scarta"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "Data: %s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "Chiudi e scarta"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "A: %s\n"
+#~ msgid "Lar_ge"
+#~ msgstr "_Grande"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Cc: %s\n"
+#~ msgid "Large"
+#~ msgstr "Grande"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Impossibile rimuovere account</span> "
+#~ msgid "_Medium"
+#~ msgstr "_Medio"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Una finestra di composizione associata a questo account è attualmente "
-"aperta. Inviare o rimuovere il messaggio e provare ancora."
+#~ msgid "Medium"
+#~ msgstr "Medio"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Aggiungi account"
+#~ msgid "_Small"
+#~ msgstr "_Piccolo"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Modifica account"
+#~ msgid "Small"
+#~ msgstr "Piccolo"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Rimuovi account"
+#~ msgid "S_ans Serif"
+#~ msgstr "S_ans Serif"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Attendere mentre Geary convalida l'account."
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Connessione non sicura"
+#~ msgid "S_erif"
+#~ msgstr "S_erif"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "Fidati _sempre di questo server"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "_Fidati di questo server"
+#~ msgid "_Fixed Width"
+#~ msgstr "_Larghezza fissa"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "_Non fidarti di questo server"
+#~ msgid "Fixed Width"
+#~ msgstr "Larghezza fissa"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Annulla"
-
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Ripeti"
-
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "_Taglia"
-
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "_Incolla"
-
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Sinistra"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Destra"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Centrato"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Giustificato"
-
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Collegamento (Ctrl+L)"
-
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "C_olore"
-
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Ulteriori opzioni"
-
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Cita il testo (Ctrl+])"
-
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Rimuovi la citazione del testo (Ctrl+[)"
-
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Rimuovi formattazione (Ctrl+Spazio)"
-
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Incolla _con formattazione"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Grassetto (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Corsivo (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Sottolineato (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Barrato (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "Testo _formattato"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Mostra i campi estesi"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "Chiudi e salva"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "Chiudi e salva"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "Chiudi e salva"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "Chiudi e scarta"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "Chiudi e scarta"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "Chiudi e scarta"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "_Grande"
-
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "Grande"
-
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "_Medio"
-
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "Medio"
-
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "_Piccolo"
-
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "Piccolo"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
-
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "S_erif"
-
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "Serif"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "_Larghezza fissa"
-
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "Larghezza fissa"
-
-#: ../ui/composer.glade.h:42
-msgid "Detach"
-msgstr "Sgancia"
-
-#: ../ui/composer.glade.h:43
-msgid "Detach (Ctrl+D)"
-msgstr "Stacca (Ctrl+D)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_Invia"
-
-#: ../ui/composer.glade.h:45
-msgid "Send"
-msgstr "Invia"
-
-#: ../ui/composer.glade.h:46
-msgid "Send (Ctrl+Enter)"
-msgstr "Invia (Ctrl+Invio)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "_Allega file"
-
-#: ../ui/composer.glade.h:48
-msgid "Attach File"
-msgstr "Allega file"
-
-#: ../ui/composer.glade.h:49
-msgid "_Include Original Attachments"
-msgstr "_Includi gli allegati originali"
-
-#: ../ui/composer.glade.h:50
-msgid "Include Original Attachments"
-msgstr "Includi gli allegati originali"
-
-#: ../ui/composer.glade.h:51
-msgid "Application Menu"
-msgstr "Menù dell'applicazione"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:53
-msgid "_To"
-msgstr "_A"
+#~ msgid "Detach"
+#~ msgstr "Sgancia"
 
-#: ../ui/composer.glade.h:54
-msgid "_Cc"
-msgstr "_Cc"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Stacca (Ctrl+D)"
 
-#: ../ui/composer.glade.h:55
-msgid "_Subject"
-msgstr "_Oggetto"
+#~ msgid "_Send"
+#~ msgstr "_Invia"
 
-#: ../ui/composer.glade.h:56
-msgid "_Bcc"
-msgstr "Cc_n"
+#~ msgid "Send"
+#~ msgstr "Invia"
 
-#: ../ui/composer.glade.h:57
-msgid "_Reply-To"
-msgstr "_Rispondi a"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Invia (Ctrl+Invio)"
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:59
-msgid "From"
-msgstr "Da"
+#~ msgid "_Attach File"
+#~ msgstr "_Allega file"
 
-#: ../ui/composer.glade.h:60
-msgid "Drop files here"
-msgstr "Trascina file qui"
+#~ msgid "Attach File"
+#~ msgstr "Allega file"
 
-#: ../ui/composer.glade.h:61
-msgid "To add them as attachments"
-msgstr "Per aggiungerli come allegati"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Includi gli allegati originali"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-msgid "Remove email address"
-msgstr "Rimuovi indirizzo email"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Includi gli allegati originali"
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"Per alcuni servizi email è necessario configurare gli indirizzi aggiuntivi "
-"sul server. Contattare il fornitore di posta per maggiori informazioni."
+#~ msgid "Application Menu"
+#~ msgstr "Menù dell'applicazione"
 
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "_Aggiorna"
+#~ msgid "_To"
+#~ msgstr "_A"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Trova:"
+#~ msgid "_Cc"
+#~ msgstr "_Cc"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Precedente"
+#~ msgid "_Subject"
+#~ msgstr "_Oggetto"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Successivo"
+#~ msgid "_Bcc"
+#~ msgstr "Cc_n"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Maiuscole/Minuscole"
+#~ msgid "_Reply-To"
+#~ msgstr "_Rispondi a"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "etichetta"
+#~ msgid "From"
+#~ msgstr "Da"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Password"
+#~ msgid "Drop files here"
+#~ msgstr "Trascina file qui"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "Indirizzo e_mail"
+#~ msgid "To add them as attachments"
+#~ msgstr "Per aggiungerli come allegati"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Password"
+#~ msgid "Remove email address"
+#~ msgstr "Rimuovi indirizzo email"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "S_ervizio"
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "Per alcuni servizi email è necessario configurare gli indirizzi aggiuntivi "
+#~ "sul server. Contattare il fornitore di posta per maggiori informazioni."
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "N_ome"
+#~ msgid "_Update"
+#~ msgstr "_Aggiorna"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "Sopran_nome"
+#~ msgid "Find:"
+#~ msgstr "Trova:"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Lavoro, casa, etc."
+#~ msgid "_Previous"
+#~ msgstr "_Precedente"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_Salva posta inviata"
+#~ msgid "_Next"
+#~ msgstr "_Successivo"
 
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
-msgstr "Indiriz_zi email aggiuntivi…"
+#~ msgid "_Case sensitive"
+#~ msgstr "_Maiuscole/Minuscole"
 
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "Impostazioni IMAP"
+#~ msgid "label"
+#~ msgstr "etichetta"
 
-#: ../ui/login.glade.h:12
-msgid "Se_rver"
-msgstr "Se_rver"
+#~ msgid "Password"
+#~ msgstr "Password"
 
-#: ../ui/login.glade.h:13
-msgid "P_ort"
-msgstr "P_orta"
+#~ msgid "E_mail address"
+#~ msgstr "Indirizzo e_mail"
 
-#: ../ui/login.glade.h:14
-msgid "Ser_ver"
-msgstr "Ser_ver"
+#~ msgid "_Password"
+#~ msgstr "_Password"
 
-#: ../ui/login.glade.h:15
-msgid "Por_t"
-msgstr "Por_ta"
+#~ msgid "S_ervice"
+#~ msgstr "S_ervizio"
 
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "Impostazioni SMTP"
+#~ msgid "N_ame"
+#~ msgstr "N_ome"
 
-#: ../ui/login.glade.h:17
-msgid "User_name"
-msgstr "_Nome utente"
+#~ msgid "N_ickname"
+#~ msgstr "Sopran_nome"
 
-#: ../ui/login.glade.h:18
-msgid "Pass_word"
-msgstr "Pass_word"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Lavoro, casa, etc."
 
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr "Nome utente SMTP"
+#~ msgid "_Save sent mail"
+#~ msgstr "_Salva posta inviata"
 
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr "Password SMTP"
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "Indiriz_zi email aggiuntivi…"
 
-#: ../ui/login.glade.h:21
-msgid "_Username"
-msgstr "Nome _utente"
+#~ msgid "IMAP settings"
+#~ msgstr "Impostazioni IMAP"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr "Nome utente IMAP"
+#~ msgid "Se_rver"
+#~ msgstr "Se_rver"
 
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr "Password IMAP"
+#~ msgid "P_ort"
+#~ msgstr "P_orta"
 
-#: ../ui/login.glade.h:24
-msgid "Encr_yption"
-msgstr "Ci_fratura"
+#~ msgid "Ser_ver"
+#~ msgstr "Ser_ver"
 
-#: ../ui/login.glade.h:25
-msgid "Encrypt_ion"
-msgstr "Cifra_tura"
+#~ msgid "Por_t"
+#~ msgstr "Por_ta"
 
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "SMTP settings"
+#~ msgstr "Impostazioni SMTP"
 
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "User_name"
+#~ msgstr "_Nome utente"
 
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "Nessuna autenticazione necessaria"
+#~ msgid "Pass_word"
+#~ msgstr "Pass_word"
 
-#: ../ui/login.glade.h:30
-msgid "Use IMAP cre_dentials"
-msgstr "Usa cre_denziali IMAP"
+#~ msgid "SMTP username"
+#~ msgstr "Nome utente SMTP"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Compositore"
+#~ msgid "SMTP password"
+#~ msgstr "Password SMTP"
 
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr "Salva le _bozze sul server"
+#~ msgid "_Username"
+#~ msgstr "Nome _utente"
 
-#: ../ui/login.glade.h:33
-msgid "Si_gn emails (HTML allowed):"
-msgstr "Fi_rma le email (HTML permesso):"
+#~ msgid "IMAP username"
+#~ msgstr "Nome utente IMAP"
 
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "Archivio"
+#~ msgid "IMAP password"
+#~ msgstr "Password IMAP"
 
-#: ../ui/login.glade.h:35
-msgid "_Download mail"
-msgstr "_Scarica posta"
+#~ msgid "Encr_yption"
+#~ msgstr "Ci_fratura"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "Credenziali SMTP"
+#~ msgid "Encrypt_ion"
+#~ msgstr "Cifra_tura"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "Nome utente"
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Ricorda password"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Autentica"
+#~ msgid "No authentication re_quired"
+#~ msgstr "Nessuna autenticazione necessaria"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Lettura"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Usa cre_denziali IMAP"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "_Seleziona automaticamente il messaggio successivo"
+#~ msgid "Composer"
+#~ msgstr "Compositore"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "_Visualizza l'anteprima della conversazione"
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Salva le _bozze sul server"
 
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr "Usa la vista a tre _pannelli"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "Fi_rma le email (HTML permesso):"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "Abilita _controllo ortografico"
+#~ msgid "Storage"
+#~ msgstr "Archivio"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "Notifiche"
+#~ msgid "_Download mail"
+#~ msgstr "_Scarica posta"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "Att_iva avvisi sonori"
+#~ msgid "SMTP Credentials"
+#~ msgstr "Credenziali SMTP"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "Mostra _notifiche per i nuovi messaggi"
+#~ msgid "Username"
+#~ msgstr "Nome utente"
 
-#: ../ui/preferences.glade.h:10
-msgid "Always _watch for new mail"
-msgstr "Controlla s_empre la nuova posta"
+#~ msgid "_Remember password"
+#~ msgstr "_Ricorda password"
 
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr ""
-"Geary sarà eseguito in background e notificherà l'arrivo di nuova posta"
+#~ msgid "_Authenticate"
+#~ msgstr "_Autentica"
 
-#: ../ui/preferences.glade.h:12
-msgid "Preferences"
-msgstr "Preferenze"
+#~ msgid "Reading"
+#~ msgstr "Lettura"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Sicuro di voler rimuovere questo "
-"account?</span> "
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Seleziona automaticamente il messaggio successivo"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Tutta la posta associata a questo account verrà rimossa dal computer. Questo "
-"non avrà effetti sulle email presenti sul server."
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Visualizza l'anteprima della conversazione"
+
+#~ msgid "Use _three pane view"
+#~ msgstr "Usa la vista a tre _pannelli"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Abilita _controllo ortografico"
+
+#~ msgid "Notifications"
+#~ msgstr "Notifiche"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "Att_iva avvisi sonori"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Mostra _notifiche per i nuovi messaggi"
+
+#~ msgid "Always _watch for new mail"
+#~ msgstr "Controlla s_empre la nuova posta"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr ""
+#~ "Geary sarà eseguito in background e notificherà l'arrivo di nuova posta"
+
+#~ msgid "Preferences"
+#~ msgstr "Preferenze"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Sicuro di voler rimuovere questo "
+#~ "account?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Tutta la posta associata a questo account verrà rimossa dal computer. Questo "
+#~ "non avrà effetti sulle email presenti sul server."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Soprannome:"
+#~ msgid "Nickname:"
+#~ msgstr "Soprannome:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Indirizzo email:"
+#~ msgid "Email address:"
+#~ msgstr "Indirizzo email:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Aggiornamento di Geary in corso"
+#~ msgid "Geary update in progress…"
+#~ msgstr "Aggiornamento di Geary in corso"
 
 #~ msgid "_Delete"
 #~ msgstr "_Elimina"
diff --git a/po/ja.po b/po/ja.po
index 07fbd2f..0692084 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,1500 +10,1617 @@ 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-20 19:28+0000\n"
-"Last-Translator: yorbajim <jim yorba org>\n"
-"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/geary/";
-"language/ja_JP/)\n"
-"Language: ja_JP\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:07+0000\n"
+"Last-Translator: Jim Nelson <jim yorba org>\n"
+"Language-Team: Japanese (Japan) "
+"(http://www.transifex.com/projects/p/geary/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:54+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: ja_JP\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:641
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; 接続エラー\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:624
-msgid "        &#8226; Email address already added to Geary.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:628
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP 接続エラー\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:631
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; IMAP ユーザー名もしくはパスワードが不正\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:621
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; アカウントのニックネームが不正\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:634
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP 接続エラー\n"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "受信トレイ"
 
-#: ../../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; SMTP ユーザー名もしくはパスワードが不正\n"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "下書き"
 
-#: ../../src/client/accounts/add-edit-page.vala:645
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; ユーザー名もしくはパスワードが不正\n"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "送信済みメール"
 
-#: ../../src/client/views/conversation-viewer.vala:1203
-msgid " (Invalid?)"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "スター"
 
-#: ../../src/client/composer/composer-window.vala:972
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" は既に添付されています"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "重要"
 
-#: ../../src/client/composer/composer-window.vala:937
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "\"%s\" は見つかりませんでした"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "すべてのメール"
 
-#: ../../src/client/composer/composer-window.vala:965
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "\"%s\" を開くことができませんでした"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "迷惑メール"
 
-#: ../../src/client/composer/composer-window.vala:944
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" はフォルダーです"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "ごみ箱"
 
-#: ../../src/client/composer/composer-window.vala:951
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" は空ファイルです"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "送信トレイ"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
 msgstr ""
 
-#. / 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 "%Y年 %B %-e日, %-H:%M"
-
-#. / 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 "%Y年 %B %-e日, %-l:%M %P"
-
-#. / 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 "%Y年 %B %-e日, %-l:%M %P"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "なし"
 
-#. / 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 "%Y %b %-e日 (%a), %l:%M %p"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr ""
 
-#. / 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 "%b %-e日"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr ""
 
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] ""
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d 件の新着メッセージ"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:43
-#, c-format
-msgid "%d results"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
 msgstr ""
 
-#. / 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] ""
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "その他"
 
-#: ../../src/client/util/util-date.vala:170
-#, c-format
-msgid "%dh ago"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
 msgstr ""
 
-#: ../../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
 msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:222
-#, c-format
-msgid "%i matches"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
 msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:224
-#, c-format
-msgid "%i matches (wrapped)"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
 msgstr ""
 
-#. / 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"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr ""
 
-#. / 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"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:107
-#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr ""
 
-#. / 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)"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
 msgstr ""
 
-#: ../../src/client/views/conversation-web-view.vala:289
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - スレッド検証"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(件名なし)"
 
-#: ../../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - 新着メッセージ"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%Y %b %-e日 (%a), %l:%M %p"
+
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr ""
 
 #. / 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
+#: ../src/engine/rfc822/rfc822-utils.vala:228
 msgid "%s wrote:"
 msgstr "%s wrote:"
 
-#: ../../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] ""
-
-#. / 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"
+#. / 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:234
+msgid "On %s:"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:246
-#, c-format
-msgid "%u conversations selected."
-msgstr "%u 件が選択されています"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- 転送されたメッセージ ----------"
 
-#: ../../src/client/views/conversation-viewer.vala:743
-#, c-format
-msgid "%u read messages"
-msgstr "%u 件の既読メッセージ"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "差出人: %s\n"
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "件名: %s\n"
 
-#: ../../src/client/util/util-email.vala:30
-msgid "(no subject)"
-msgstr "(件名なし)"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "日時: %s\n"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- 転送されたメッセージ ----------"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "宛先: %s\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:211
-msgid "1 month back"
-msgstr "1ヶ月前"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:214
-msgid "1 year back"
-msgstr "1年前"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "無題"
 
-#: ../../src/client/accounts/add-edit-page.vala:210
-msgid "2 weeks back"
-msgstr "2週間前"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "メールクライアント"
 
-#: ../../src/client/accounts/add-edit-page.vala:212
-msgid "3 months back"
-msgstr "3ヶ月前"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:213
-msgid "6 months back"
-msgstr "6ヶ月前"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Yorba のウェブサイト"
 
-#: ../../ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">このアカウントを削除してもよろしいです"
-"か?</span> "
 
-#: ../../ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#: ../src/client/application/geary-controller.vala:62
+msgid "Delete conversation (Shift+Delete)"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">アカウントを削除できません</span>"
 
-#: ../../ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/application/geary-controller.vala:63
+msgid "Delete conversations (Shift+Delete)"
 msgstr ""
-"アカウントと関連づけられた作成画面が既に開いています. メッセージを送信するか"
-"破棄してからもう一度試してください"
 
-#: ../../src/client/geary-controller.vala:1491
-#, c-format
-msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr "\"%s\" は既に存在します. 上書きしますか?"
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:245
-msgid "A_ccounts"
-msgstr "アカウント(_C)"
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:1227
-#, c-format
-msgid "About %s"
-msgstr "%s について"
+#: ../src/client/application/geary-controller.vala:72
+msgid "_Archive"
+msgstr "アーカイブ(_A)"
 
-#: ../../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "アカウント"
+#: ../src/client/application/geary-controller.vala:73
+msgid "Archive conversation (A)"
+msgstr ""
 
-#: ../../ui/account_list.glade:71
-msgid "Add account"
+#: ../src/client/application/geary-controller.vala:74
+msgid "Archive conversations (A)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:304
-msgid "Add label"
+#: ../src/client/application/geary-controller.vala:77
+msgid "Mark as S_pam"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:78
+msgid "Mark as not S_pam"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
+msgid "Mark conversation"
+msgstr "スレッドをマーク"
+
+#: ../src/client/application/geary-controller.vala:81
+msgid "Mark conversations"
+msgstr "スレッドをマーク"
+
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "スレッドにラベルを付ける"
 
-#: ../../src/client/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "スレッドにラベルを付ける"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "すべてのメール"
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
+msgid "Move conversation"
+msgstr "スレッドを移動"
 
-#: ../../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 ""
-"このアカウントに関連づけされた全てのメールは、コンピューターから削除されます."
-"これは、サーバー上のメールには影響を与えません."
+#: ../src/client/application/geary-controller.vala:85
+msgid "Move conversations"
+msgstr "スレッドを移動"
 
-#: ../../src/client/geary-args.vala:24
-msgid "Allow inspection of WebView"
-msgstr "WebView での検証を有効にする"
+#: ../src/client/application/geary-controller.vala:372
+msgid "A_ccounts"
+msgstr "アカウント(_C)"
 
-#: ../../src/client/views/conversation-viewer.vala:509
-msgid "Always Show From Sender"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:377
+#: ../src/client/components/stock.vala:27
+msgid "_Preferences"
+msgstr "設定(_P)"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/components/stock.vala:25
+msgid "_Help"
+msgstr "ヘルプ(_H)"
 
-#: ../../src/client/geary-controller.vala:48
-msgid "Archive conversation (Delete, Backspace, A)"
-msgstr "スレッドをアーカイブ (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:385
+#: ../src/client/components/stock.vala:21
+msgid "_About"
+msgstr "このアプリケーションについて(_A)"
 
-#: ../../src/client/geary-controller.vala:49
-msgid "Archive conversations (Delete, Backspace, A)"
-msgstr "スレッドをアーカイブ (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:389
+#: ../src/client/components/stock.vala:29
+msgid "_Quit"
+msgstr "終了(_Q)"
 
-#: ../../src/client/geary-controller.vala:1477
-#, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr "\"%s\" を開きますか?"
+#: ../src/client/application/geary-controller.vala:394
+msgid "_Mark as..."
+msgstr "名前を付けてマーク(_M)"
 
-#: ../../src/client/geary-controller.vala:1478
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
+#: ../src/client/application/geary-controller.vala:400
+msgid "Mark as _Read"
 msgstr ""
-"添付ファイルはシステムにダメージを与える恐れがあります. 信頼できる送信元から"
-"のみ開くようにしてください."
-
-#: ../../src/client/views/conversation-viewer.vala:614
-msgid "Bcc:"
-msgstr "Bcc:"
 
-#: ../../ui/composer.glade:113
-msgid "Bold (Ctrl+B)"
-msgstr "太字(Ctrl+B)"
-
-#: ../../ui/composer.glade:69
-msgid "C_olor"
-msgstr "色(_O)"
+#: ../src/client/application/geary-controller.vala:406
+msgid "Mark as _Unread"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:926
-msgid "Cannot add attachment"
-msgstr "添付できません"
+#: ../src/client/application/geary-controller.vala:412
+msgid "_Star"
+msgstr "スター(_S)"
 
-#: ../../src/client/views/conversation-viewer.vala:611
-msgid "Cc:"
-msgstr "Cc:"
+#: ../src/client/application/geary-controller.vala:417
+msgid "U_nstar"
+msgstr "スターをはずす(_N)"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
+#: ../src/client/application/geary-controller.vala:427
+msgid "Add label"
 msgstr ""
 
-#: ../../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "ファイルを選択"
-
-#: ../../src/client/geary-controller.vala:553
-msgid "Co_ntinue"
-msgstr "継続(_N)"
+#: ../src/client/application/geary-controller.vala:428
+msgid "_Label"
+msgstr "ラベル(_L)"
 
-#: ../../src/client/geary-application.vala:29
-msgid "Compose Message"
-msgstr "メッセージを作成"
+#: ../src/client/application/geary-controller.vala:432
+msgid "_Move"
+msgstr "移動(_M)"
 
-#: ../../src/client/geary-controller.vala:313
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr ""
 
-#: ../../ui/preferences.glade:117
-msgid "Composer"
-msgstr "作成画面"
-
-#: ../../src/client/views/conversation-viewer.vala:897
-msgid "Copy _Email Address"
-msgstr "アドレスをコピー(_E)"
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
+msgid "_Reply"
+msgstr "返信(_R)"
 
-#: ../../src/client/views/conversation-viewer.vala:902
-msgid "Copy _Link"
-msgstr "リンクのアドレスをコピー(_L)"
+#: ../src/client/application/geary-controller.vala:441
+msgid "Reply (Ctrl+R, R)"
+msgstr ""
 
-#: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr "Copyright 2011-2013 Yorba Foundation"
+#: ../src/client/application/geary-controller.vala:445
+msgid "R_eply All"
+msgstr ""
 
-#: ../../ui/composer.glade:21
-msgid "Cu_t"
+#: ../src/client/application/geary-controller.vala:446
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:620
-msgid "Date:"
-msgstr "日時:"
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
+msgid "_Forward"
+msgstr "転送(_F)"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "日時: %s\n"
+#: ../src/client/application/geary-controller.vala:452
+msgid "Forward (Ctrl+L, F)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:43
-msgid "Delete conversation (Delete, Backspace, A)"
-msgstr "スレッドを削除 (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:44
-msgid "Delete conversations (Delete, Backspace, A)"
-msgstr "スレッドを削除 (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:25
-msgid "Display program version"
-msgstr "バージョンを表示"
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:663
-msgid "Do you want to discard the unsaved message?"
-msgstr "未保存のメッセージを破棄しますか?"
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:666
-msgid "Do you want to discard this message?"
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1479
-msgid "Don't _ask me again"
-msgstr "次回から表示しない(_A)"
+#: ../src/client/application/geary-controller.vala:746
+msgid "Unable to store server trust exception"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "下書き"
+#: ../src/client/application/geary-controller.vala:983
+msgid "Your settings are insecure"
+msgstr "設定がセキュアでありません"
+
+#: ../src/client/application/geary-controller.vala:984
+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 ""
+"IMAP/SMTP の通信に SSL/TLS が指定されていません. ユーザー名やパスワードはネットワーク上の他人に読み取られる可能性があります. "
+"よろしいですか?"
 
-#: ../../ui/composer.glade:419
-msgid "Drop files here"
-msgstr "ここにファイルをドロップ"
+#: ../src/client/application/geary-controller.vala:985
+msgid "Co_ntinue"
+msgstr "継続(_N)"
 
-#: ../../ui/login.glade:115
-msgid "E_mail address:"
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/components/status-bar.vala:29
+msgid "Error sending email"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:704
-msgid "E_xit"
+#: ../src/client/application/geary-controller.vala:1064
+msgid ""
+"Geary encountered an error sending an email.  If the problem persists, "
+"please manually delete the email from your Outbox folder."
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:533
-msgid "Edit Draft"
+#: ../src/client/application/geary-controller.vala:1068
+#: ../src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
 msgstr ""
 
-#: ../../ui/account_list.glade:84
-msgid "Edit account"
+#: ../src/client/application/geary-controller.vala:1069
+msgid ""
+"Geary encountered an error saving a sent message to Sent Mail.  The message "
+"will stay in your Outbox folder until you delete it."
 msgstr ""
 
-#: ../../ui/remove_confirm.glade:94
-msgid "Email address:"
-msgstr "メールアドレス:"
+#: ../src/client/application/geary-controller.vala:1138
+msgid "Labels"
+msgstr "ラベル"
 
-#: ../../src/client/geary-application.vala:28
-msgid "Email;E-mail;Mail;"
+#: ../src/client/application/geary-controller.vala:1150
+msgid "Unable to open the database for %s"
 msgstr ""
 
-#: ../../ui/preferences.glade:131
-msgid "Enable _spell checking"
-msgstr "スペルチェックを有効(_S)"
+#: ../src/client/application/geary-controller.vala:1151
+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 ""
 
-#: ../../ui/login.glade:588
-msgid "Encr_yption:"
-msgstr "暗号化(_Y):"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "_Rebuild"
+msgstr ""
 
-#: ../../ui/login.glade:607
-msgid "Encrypt_ion:"
-msgstr "暗号化(_I):"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "E_xit"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-msgid "Enter your account information to get started."
-msgstr "アカウント情報を入力してください"
+#: ../src/client/application/geary-controller.vala:1162
+msgid "Unable to rebuild database for \"%s\""
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:714
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:43
-msgid "Error saving"
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
+msgid "Unable to open local mailbox for %s"
 msgstr ""
 
-#. / 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"
+#: ../src/client/application/geary-controller.vala:1186
+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 ""
 
-#: ../../src/client/accounts/add-edit-page.vala:216
-msgid "Everything"
-msgstr "すべて"
-
-#: ../../src/client/views/conversation-viewer.vala:1897
-msgid "Failed to open default text editor."
-msgstr "テキストエディターの起動に失敗しました"
-
-#: ../../src/client/geary-args.vala:54
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "不明なコマンドラインオプション: %s\n"
+#: ../src/client/application/geary-controller.vala:1196
+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 ""
 
-#. / 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"
+#: ../src/client/application/geary-controller.vala:1207
+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 ""
 
-#: ../../ui/composer.glade:182
-msgid "Fixed Width"
+#: ../src/client/application/geary-controller.vala:1715
+msgid "About %s"
+msgstr "%s について"
+
+#. / Translators: add your name and email address to receive credit in the About dialog
+#. / For example: Yamada Taro <yamada taro example com>
+#: ../src/client/application/geary-controller.vala:1718
+msgid "translator-credits"
 msgstr ""
+"Minato Kanzaki <pikadcolon gmail com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Jim Nelson https://launchpad.net/~yorba-jim";
 
-#: ../../src/client/geary-controller.vala:329
-msgid "Forward (Ctrl+L, F)"
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:605
-msgid "From:"
-msgstr "差出人:"
+#: ../src/client/application/geary-controller.vala:1986
+msgid "Are you sure you want to open \"%s\"?"
+msgstr "\"%s\" を開きますか?"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "差出人: %s\n"
+#: ../src/client/application/geary-controller.vala:1987
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr "添付ファイルはシステムにダメージを与える恐れがあります. 信頼できる送信元からのみ開くようにしてください."
 
-#: ../../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#: ../src/client/application/geary-controller.vala:1988
+msgid "Don't _ask me again"
+msgstr "次回から表示しない(_A)"
 
-#: ../../src/client/geary-application.vala:25
-msgid "Geary Mail"
-msgstr "Geary Mail"
+#: ../src/client/application/geary-controller.vala:2006
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr "\"%s\" は既に存在します. 上書きしますか?"
 
-#: ../../src/client/geary-controller.vala:626
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
-msgstr ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr "\"%s\" は既に存在します. 上書きしますか?"
+
+#: ../src/client/application/geary-controller.vala:2011
+msgid "_Replace"
+msgstr "置換(_R)"
 
-#: ../../ui/password-dialog.glade:315
-msgid "General"
+#: ../src/client/application/geary-controller.vala:2309
+msgid "Close open draft messages?"
 msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:133
-msgid "IMAP Credentials"
-msgstr "IMAP 証明書"
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
 
-#: ../../ui/login.glade:572
-msgid "IMAP password"
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
 msgstr ""
 
-#: ../../ui/login.glade:286 ../../ui/password-dialog.glade:334
-msgid "IMAP settings"
-msgstr "IMAP 設定"
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
 
-#: ../../ui/login.glade:556
-msgid "IMAP username"
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "重要"
+#: ../src/client/application/geary-controller.vala:2489
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "受信トレイ"
+#: ../src/client/application/geary-controller.vala:2491
+msgid "Delete"
+msgstr ""
 
-#: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "受信トレイ"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:163
-#, c-format
-msgid "Indexing %s account"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
 msgstr ""
 
-#: ../../ui/composer.glade:120
-msgid "Italic (Ctrl+I)"
-msgstr "斜体(Ctrl+I)"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:689
-msgid "Labels"
-msgstr "ラベル"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "デバッグ情報を出力"
 
-#: ../../ui/composer.glade:151
-msgid "Lar_ge"
-msgstr ""
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "会話の監視を記録"
 
-#: ../../ui/composer.glade:152
-msgid "Large"
-msgstr "大"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr ""
 
-#: ../../ui/composer.glade:62
-msgid "Link (Ctrl+L)"
-msgstr "リンク(Ctrl+L)"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "ネットワーク情報を記録"
 
 #. / 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
+#: ../src/client/application/geary-args.vala:17
 msgid "Log IMAP replay queue"
 msgstr "IMAP のイベントキューを記録"
 
-#: ../../src/client/geary-args.vala:11
-msgid "Log conversation monitoring"
-msgstr "会話の監視を記録"
+#. / 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 "ネットワークのストリームを記録"
+
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "定期的な行動を記録"
 
-#: ../../src/client/geary-args.vala:21
+#: ../src/client/application/geary-args.vala:22
 msgid "Log database queries (generates lots of messages)"
 msgstr "データベースクエリを記録 (多くのメッセージを生成します)"
 
 #. / "Normalization" can also be called "synchronization"
-#: ../../src/client/geary-args.vala:23
+#: ../src/client/application/geary-args.vala:24
 msgid "Log folder normalization"
 msgstr "フォルダーの同期を記録"
 
-#: ../../src/client/geary-args.vala:13
-msgid "Log network activity"
-msgstr "ネットワーク情報を記録"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "WebView での検証を有効にする"
 
-#: ../../src/client/geary-args.vala:12
-msgid "Log network deserialization"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
 msgstr ""
 
-#. / 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 "ネットワークのストリームを記録"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "バージョンを表示"
 
-#: ../../src/client/geary-args.vala:20
-msgid "Log periodic activity"
-msgstr "定期的な行動を記録"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr ""
 
-#: ../../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "コメント・提案、バグ報告はこちら:"
 
-#: ../../src/client/geary-application.vala:26
-msgid "Mail Client"
-msgstr "メールクライアント"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "不明なコマンドラインオプション: %s\n"
 
-#: ../../src/client/views/conversation-viewer.vala:1479
-msgid "Mark Unread From _Here"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "不明なオプション \"%s\"\n"
+
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - 新着メッセージ"
+
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d 件の新着メッセージ"
+
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "開く"
+
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "自分"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:52
-msgid "Mark as S_pam"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:277
-msgid "Mark as _Read"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:283
-msgid "Mark as _Unread"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:53
-msgid "Mark as not S_pam"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:55
-#: ../../src/client/geary-controller.vala:269
-msgid "Mark conversation"
-msgstr "スレッドをマーク"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:56
-msgid "Mark conversations"
-msgstr "スレッドをマーク"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
 
-#: ../../src/client/views/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "自分"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
 
-#: ../../ui/composer.glade:158
-msgid "Medium"
-msgstr "中"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
 
-#: ../../ui/composer.glade:75
-msgid "More options"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:59
-#: ../../src/client/geary-controller.vala:308
-msgid "Move conversation"
-msgstr "スレッドを移動"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:60
-msgid "Move conversations"
-msgstr "スレッドを移動"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr ""
 
-#: ../../ui/login.glade:176
-msgid "N_ame:"
-msgstr "名前(_A):"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr ""
 
-#: ../../ui/login.glade:230
-msgid "N_ickname:"
-msgstr "ニックネーム(_I):"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "新規メッセージ"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:80
-msgid "Nickname:"
-msgstr "ニックネーム:"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr ""
 
-#: ../../ui/login.glade:661
-msgid "No authentication re_quired"
-msgstr "認証は必要とされていません(_Q)"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "ファイルを選択"
 
-#: ../../src/client/views/conversation-viewer.vala:275
-msgid "No conversations in folder."
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "添付(_A)"
+
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:244
-msgid "No conversations selected."
-msgstr "メッセージが選択されていません"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "アカウント"
 
-#: ../../src/client/views/conversation-viewer.vala:273
-msgid "No search results found."
+#. / 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 ""
 
-#: ../../src/client/dialogs/password-dialog.vala:128
-#: ../../src/engine/api/geary-special-folder-type.vala:58
-msgid "None"
-msgstr "なし"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Geary へようこそ"
+
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "アカウント情報を入力してください"
 
-#: ../../ui/preferences.glade:158
-msgid "Notifications"
-msgstr "通知"
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2週間前"
 
-#: ../../src/client/util/util-date.vala:164
-msgid "Now"
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1ヶ月前"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3ヶ月前"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6ヶ月前"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1年前"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
 msgstr ""
 
-#. / 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:"
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
 msgstr ""
 
-#. / 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:"
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "すべて"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
 msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "開く"
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "その他"
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "送信トレイ"
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "検証できません:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; アカウントのニックネームが不正\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:10
-msgid "Output debugging information"
-msgstr "デバッグ情報を出力"
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; IMAP 接続エラー\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; IMAP ユーザー名もしくはパスワードが不正\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; SMTP 接続エラー\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; SMTP ユーザー名もしくはパスワードが不正\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; 接続エラー\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; ユーザー名もしくはパスワードが不正\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "保存(_S)"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "追加(_A)"
+
+#. / 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 "%l:%M %P"
+
+#. / 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 "%b %-e日"
 
-#: ../../ui/login.glade:337
-msgid "P_ort:"
-msgstr "ポート(_O):"
+#. / 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"
 
-#: ../../ui/login.glade:474
-msgid "Pass_word:"
-msgstr "パスワード(_W):"
+#. / 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 "%Y年 %B %-e日, %-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 "%Y年 %B %-e日, %-H:%M"
 
-#: ../../ui/login.glade:101
-msgid "Password"
+#. / 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 "%Y年 %B %-e日, %-l:%M %P"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:196
-msgid "Password:"
-msgstr "パスワード:"
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:102
-msgid "Paste _With Formatting"
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your email password"
-msgstr "パスワードを入力してください"
+#. / 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
+msgid "%A"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:47
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "コメント・提案、バグ報告はこちら:"
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "バイト"
+
+#: ../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"
 
-#: ../../ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
-msgstr "アカウントを検証しています..."
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "KB"
 
-#: ../../ui/login.glade:421
-msgid "Por_t:"
-msgstr "ポート(_T):"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/password-dialog.glade:367 ../../ui/password-dialog.glade:470
-msgid "Port:"
-msgstr "ポート:"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:81
-msgid "Quote text  (Ctrl+])"
+#. / 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
+msgid "%s, %s"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:322
-msgid "R_eply All"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "受信トレイ"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
 msgstr ""
 
-#: ../../ui/preferences.glade:55
-msgid "Reading"
-msgstr "表示画面"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/password-dialog.glade:274
-msgid "Real name:"
-msgstr "本名:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "メッセージが選択されていません"
 
-#: ../../src/client/accounts/add-edit-page.vala:590
-msgid "Remem_ber password"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:583
-msgid "Remem_ber passwords"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
 msgstr ""
 
-#: ../../ui/account_list.glade:97
-msgid "Remove account"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
 msgstr ""
 
-#: ../../ui/composer.glade:95
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "書式をリセット(Ctrl+Space)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:318
-msgid "Reply (Ctrl+R, R)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:323
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1452
-msgid "Reply to _All"
-msgstr "全員に返信(_A)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "差出人:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "宛先:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Cc:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Bcc:"
 
-#: ../../ui/password-dialog.glade:163
-msgid "SMTP Credentials"
-msgstr "SMTP 証明書"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "件名:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "日時:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:507
-msgid "SMTP password"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
 msgstr ""
 
-#: ../../ui/login.glade:439 ../../ui/password-dialog.glade:437
-msgid "SMTP settings"
-msgstr "SMTP 設定"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "コピー(_C)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "アドレスをコピー(_E)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "リンクのアドレスをコピー(_L)"
 
-#: ../../ui/login.glade:491
-msgid "SMTP username"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:124
-msgid "SSL"
-msgstr "SSL"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "すべて選択(_A)"
 
-#: ../../ui/password-dialog.glade:382 ../../ui/password-dialog.glade:485
-msgid "SSL/TLS encryption:"
-msgstr "SSL/TLS 暗号化:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "検証(_I)"
 
-#: ../../src/client/dialogs/password-dialog.vala:126
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr ""
 
-#: ../../ui/composer.glade:169
-msgid "S_ans Serif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
 msgstr ""
 
-#: ../../ui/composer.glade:175
-msgid "S_erif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
 msgstr ""
 
-#: ../../ui/login.glade:160
-msgid "S_ervice:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
 msgstr ""
 
-#: ../../ui/composer.glade:170
-msgid "Sans Serif"
-msgstr "ゴシック体"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "名前を付けて保存(_S)..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "全ての添付ファイルを保存(_T)"
 
-#: ../../src/client/views/conversation-viewer.vala:1437
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
 msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] "添付ファイルを保存(_T)"
 
-#: ../../src/client/views/conversation-viewer.vala:1400
-msgid "Save All A_ttachments..."
-msgstr "全ての添付ファイルを保存(_T)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "全員に返信(_A)"
 
-#: ../../src/client/composer/composer-window.vala:41
-msgid "Saved"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "既読としてマーク(_M)"
 
-#: ../../src/client/composer/composer-window.vala:42
-msgid "Saving"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "未読としてマーク(_M)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
 msgstr ""
 
-#: ../../ui/login.glade:304
-msgid "Se_rver:"
-msgstr "サーバー(_R):"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "ソースを表示(_V)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "テキストエディターの起動に失敗しました"
 
-#: ../../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"
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr "%s - スレッド検証"
+
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
 msgstr ""
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:39
-#: ../../src/client/ui/main-toolbar.vala:170
-#, c-format
-msgid "Search %s account"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
 msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:76
-msgid "Search all mail in account for keywords (Ctrl+S)"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:1243
-msgid "Select Color"
-msgstr "色を選択"
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr ""
 
-#: ../../src/client/ui/stock.vala:32
-#: ../../src/client/views/conversation-viewer.vala:916
-msgid "Select _All"
-msgstr "すべて選択(_A)"
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "新規メッセージ"
 
-#: ../../src/client/views/conversation-viewer.vala:910
-msgid "Select _Message"
+#: ../src/client/composer/composer-widget.vala:138
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:27
-msgid "Send and receive email"
-msgstr "送受信"
-
-#: ../../src/client/composer/composer-window.vala:747
-msgid "Send message with an empty body?"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:743
+#: ../src/client/composer/composer-widget.vala:1262
 msgid "Send message with an empty subject and body?"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:745
+#: ../src/client/composer/composer-widget.vala:1264
 msgid "Send message with an empty subject?"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:749
-msgid "Send message without an attachment?"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
 msgstr ""
 
-#. / 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..."
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "送信済みメール"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "添付できません"
+
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "\"%s\" は見つかりませんでした"
 
-#: ../../ui/login.glade:404
-msgid "Ser_ver:"
-msgstr "サーバー(_V):"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" はフォルダーです"
 
-#: ../../ui/composer.glade:176
-msgid "Serif"
-msgstr "明朝体"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" は空ファイルです"
 
-#: ../../ui/password-dialog.glade:352 ../../ui/password-dialog.glade:455
-msgid "Server:"
-msgstr "サーバー:"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "\"%s\" を開くことができませんでした"
 
-#: ../../ui/password-dialog.glade:259
-msgid "Service:"
-msgstr "メールサービス:"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "\"%s\" は既に添付されています"
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "Show Images"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
 msgstr ""
 
-#: ../../ui/preferences.glade:193
-msgid "Show _notifications for new mail"
-msgstr "新着メールに通知を表示(_N)"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr ""
 
-#: ../../ui/composer.glade:164
-msgid "Small"
-msgstr "小"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "迷惑メール"
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "スター"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr ""
 
-#: ../../ui/login.glade:761
-msgid "Storage"
-msgstr "ストレージ"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "色を選択"
 
-#: ../../ui/composer.glade:134
-msgid "Strikethrough (Ctrl+K)"
-msgstr "取り消し線(Ctrl+K)"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:617
-msgid "Subject:"
-msgstr "件名:"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr "件名: %s\n"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr ""
 
-#: ../../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:1493
-#, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr "\"%s\" は既に存在します. 上書きしますか?"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/geary-controller.vala:747
-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 ""
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../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."
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
 msgstr ""
 
-#: ../../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"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
 msgstr ""
 
-#: ../../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>"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "キャンセル(_C)"
+
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1147
-msgid "This link appears to go to"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "This message contains remote images."
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
 msgstr ""
 
-#: ../../ui/composer.glade:435
-msgid "To add them as attachments"
-msgstr "添付ファイルとして追加"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:608
-msgid "To:"
-msgstr "宛先:"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "削除(_R)"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "宛先: %s\n"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "ごみ箱"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:294
-msgid "U_nstar"
-msgstr "スターをはずす(_N)"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:17
-msgid "Unable to login to email server"
-msgstr "ログインに失敗しました"
+#~ msgid "%u conversations selected."
+#~ msgstr "%u 件が選択されています"
 
-#: ../../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 ""
+#~ msgid "%u read messages"
+#~ msgstr "%u 件の既読メッセージ"
 
-#: ../../src/client/geary-controller.vala:701
-#, c-format
-msgid "Unable to open the database for %s"
-msgstr ""
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr "<span weight=\"bold\" size=\"larger\">このアカウントを削除してもよろしいですか?</span> "
 
-#: ../../src/client/geary-controller.vala:713
-#, c-format
-msgid "Unable to rebuild database for \"%s\""
-msgstr ""
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr "<span weight=\"bold\" size=\"larger\">アカウントを削除できません</span> "
 
-#: ../../src/client/accounts/add-edit-page.vala:619
-msgid "Unable to validate:\n"
-msgstr "検証できません: \n"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr "アカウントと関連づけられた作成画面が既に開いています. メッセージを送信するか破棄してからもう一度試してください"
 
-#: ../../ui/composer.glade:127
-msgid "Underline (Ctrl+U)"
-msgstr "下線(Ctrl+U)"
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr "このアカウントに関連づけされた全てのメールは、コンピューターから削除されます.これは、サーバー上のメールには影響を与えません."
 
-#: ../../ui/composer.glade:88
-msgid "Unquote text (Ctrl+[)"
-msgstr ""
+#~ msgid "Archive conversation (Delete, Backspace, A)"
+#~ msgstr "スレッドをアーカイブ (Delete, Backspace, A)"
 
-#: ../../src/client/geary-args.vala:65
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "不明なオプション \"%s\"\n"
+#~ msgid "Archive conversations (Delete, Backspace, A)"
+#~ msgstr "スレッドをアーカイブ (Delete, Backspace, A)"
 
-#: ../../ui/login.glade:457
-msgid "User_name:"
-msgstr "ユーザー名(_N):"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "太字(Ctrl+B)"
 
-#: ../../ui/password-dialog.glade:70 ../../ui/password-dialog.glade:181
-msgid "Username:"
-msgstr "ユーザー名:"
+#~ msgid "C_olor"
+#~ msgstr "色(_O)"
 
-#: ../../src/client/geary-application.vala:19
-msgid "Visit the Yorba web site"
-msgstr "Yorba のウェブサイト"
+#~ msgid "Compose Message"
+#~ msgstr "メッセージを作成"
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-#, c-format
-msgid "Welcome to Geary."
-msgstr "Geary へようこそ"
+#~ msgid "Composer"
+#~ msgstr "作成画面"
 
-#: ../../ui/login.glade:252
-msgid "Work, Home, etc."
-msgstr ""
+#~ msgid "Copyright 2011-2013 Yorba Foundation"
+#~ msgstr "Copyright 2011-2013 Yorba Foundation"
 
-#: ../../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid "Delete conversation (Delete, Backspace, A)"
+#~ msgstr "スレッドを削除 (Delete, Backspace, A)"
 
-#: ../../src/client/util/util-date.vala:177
-msgid "Yesterday"
-msgstr ""
+#~ msgid "Delete conversations (Delete, Backspace, A)"
+#~ msgstr "スレッドを削除 (Delete, Backspace, A)"
 
-#: ../../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 ""
-"IMAP/SMTP の通信に SSL/TLS が指定されていません. ユーザー名やパスワードはネッ"
-"トワーク上の他人に読み取られる可能性があります. よろしいですか?"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "未保存のメッセージを破棄しますか?"
 
-#: ../../src/client/geary-controller.vala:551
-msgid "Your settings are insecure"
-msgstr "設定がセキュアでありません"
+#~ msgid "Drop files here"
+#~ msgstr "ここにファイルをドロップ"
 
-#: ../../src/client/geary-controller.vala:258
-#: ../../src/client/ui/stock.vala:21
-msgid "_About"
-msgstr "このアプリケーションについて(_A)"
+#~ msgid "Email address:"
+#~ msgstr "メールアドレス:"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:22
-msgid "_Add"
-msgstr "追加(_A)"
+#~ msgid "Enable _spell checking"
+#~ msgstr "スペルチェックを有効(_S)"
 
-#: ../../src/client/geary-controller.vala:47
-msgid "_Archive"
-msgstr "アーカイブ(_A)"
+#~ msgid "Encr_yption:"
+#~ msgstr "暗号化(_Y):"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "添付(_A)"
+#~ msgid "Encrypt_ion:"
+#~ msgstr "暗号化(_I):"
 
-#: ../../ui/composer.glade:525
-msgid "_Attach File"
-msgstr "ファイルを添付(_A)"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary Mail"
 
-#: ../../ui/preferences.glade:69
-msgid "_Automatically select next message"
-msgstr "自動的に次のメッセージを選択(_A)"
+#~ msgid "IMAP Credentials"
+#~ msgstr "IMAP 証明書"
 
-#: ../../src/client/ui/stock.vala:19
-msgid "_Cancel"
-msgstr "キャンセル(_C)"
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP 設定"
 
-#: ../../ui/composer.glade:52
-msgid "_Center"
-msgstr "中央揃え(_C)"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "斜体(Ctrl+I)"
 
-#: ../../src/client/ui/stock.vala:23
-msgid "_Close"
-msgstr ""
+#~ msgid "Large"
+#~ msgstr "大"
 
-#: ../../src/client/views/conversation-viewer.vala:889
-msgid "_Copy"
-msgstr "コピー(_C)"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "リンク(Ctrl+L)"
 
-#: ../../src/client/geary-controller.vala:42
-msgid "_Delete"
-msgstr "削除(_D)"
+#~ msgid "Medium"
+#~ msgstr "中"
 
-#: ../../ui/password-dialog.glade:548
-msgid "_Details"
-msgstr "詳細(_D)"
+#~ msgid "N_ame:"
+#~ msgstr "名前(_A):"
 
-#: ../../src/client/ui/stock.vala:24
-msgid "_Discard"
-msgstr ""
+#~ msgid "N_ickname:"
+#~ msgstr "ニックネーム(_I):"
 
-#: ../../ui/preferences.glade:90
-msgid "_Display conversation preview"
-msgstr ""
+#~ msgid "Nickname:"
+#~ msgstr "ニックネーム:"
 
-#: ../../src/client/geary-controller.vala:262
-msgid "_Donate"
-msgstr ""
+#~ msgid "No authentication re_quired"
+#~ msgstr "認証は必要とされていません(_Q)"
 
-#: ../../ui/login.glade:782
-msgid "_Download mail:"
-msgstr "メールをダウンロード(_D):"
+#~ msgid "Notifications"
+#~ msgstr "通知"
 
-#: ../../ui/composer.glade:181
-msgid "_Fixed Width"
-msgstr ""
+#~ msgid "P_ort:"
+#~ msgstr "ポート(_O):"
 
-#: ../../src/client/geary-controller.vala:328
-#: ../../src/client/views/conversation-viewer.vala:1457
-msgid "_Forward"
-msgstr "転送(_F)"
+#~ msgid "Pass_word:"
+#~ msgstr "パスワード(_W):"
 
-#: ../../src/client/geary-controller.vala:254
-#: ../../src/client/ui/stock.vala:25
-msgid "_Help"
-msgstr "ヘルプ(_H)"
+#~ msgid "Password:"
+#~ msgstr "パスワード:"
 
-#: ../../ui/composer.glade:542
-msgid "_Include Original Attachments"
-msgstr ""
+#~ msgid "Please enter your email password"
+#~ msgstr "パスワードを入力してください"
 
-#: ../../src/client/views/conversation-viewer.vala:922
-msgid "_Inspect"
-msgstr "検証(_I)"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "アカウントを検証しています..."
 
-#: ../../ui/composer.glade:57
-msgid "_Justify"
-msgstr "両端揃え(_J)"
+#~ msgid "Por_t:"
+#~ msgstr "ポート(_T):"
 
-#: ../../src/client/ui/stock.vala:33
-msgid "_Keep"
-msgstr ""
+#~ msgid "Port:"
+#~ msgstr "ポート:"
 
-#: ../../src/client/geary-controller.vala:305
-msgid "_Label"
-msgstr "ラベル(_L)"
+#~ msgid "Reading"
+#~ msgstr "表示画面"
 
-#: ../../ui/composer.glade:42
-msgid "_Left"
-msgstr "左揃え(_L)"
+#~ msgid "Real name:"
+#~ msgstr "本名:"
 
-#: ../../src/client/views/conversation-viewer.vala:1469
-msgid "_Mark as Read"
-msgstr "既読としてマーク(_M)"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "書式をリセット(Ctrl+Space)"
 
-#: ../../src/client/views/conversation-viewer.vala:1473
-msgid "_Mark as Unread"
-msgstr "未読としてマーク(_M)"
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP 証明書"
 
-#: ../../src/client/geary-controller.vala:271
-msgid "_Mark as..."
-msgstr "名前を付けてマーク(_M)"
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP 設定"
 
-#: ../../ui/composer.glade:157
-msgid "_Medium"
-msgstr ""
+#~ msgid "SSL"
+#~ msgstr "SSL"
 
-#: ../../src/client/geary-controller.vala:309
-msgid "_Move"
-msgstr "移動(_M)"
+#~ msgid "SSL/TLS encryption:"
+#~ msgstr "SSL/TLS 暗号化:"
 
-#: ../../src/client/ui/stock.vala:18
-msgid "_OK"
-msgstr ""
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../../src/client/ui/stock.vala:26
-msgid "_Open"
-msgstr ""
+#~ msgid "Sans Serif"
+#~ msgstr "ゴシック体"
 
-#: ../../ui/login.glade:131 ../../ui/login.glade:539
-#: ../../ui/password-dialog.glade:85
-msgid "_Password:"
-msgstr "パスワード(_P):"
+#~ msgid "Se_rver:"
+#~ msgstr "サーバー(_R):"
 
-#: ../../ui/composer.glade:35
-msgid "_Paste"
-msgstr ""
+#~ msgid "Send and receive email"
+#~ msgstr "送受信"
 
-#: ../../ui/preferences.glade:172
-msgid "_Play notification sounds"
-msgstr "通知音を再生(_P)"
+#~ msgid "Ser_ver:"
+#~ msgstr "サーバー(_V):"
 
-#: ../../src/client/geary-controller.vala:250
-#: ../../src/client/ui/stock.vala:27
-msgid "_Preferences"
-msgstr "設定(_P)"
+#~ msgid "Serif"
+#~ msgstr "明朝体"
 
-#: ../../src/client/ui/stock.vala:28
-msgid "_Print..."
-msgstr ""
+#~ msgid "Server:"
+#~ msgstr "サーバー:"
 
-#: ../../src/client/geary-controller.vala:266
-#: ../../src/client/ui/stock.vala:29
-msgid "_Quit"
-msgstr "終了(_Q)"
+#~ msgid "Service:"
+#~ msgstr "メールサービス:"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "_Rebuild"
-msgstr ""
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "新着メールに通知を表示(_N)"
 
-#: ../../ui/composer.glade:14
-msgid "_Redo"
-msgstr ""
+#~ msgid "Small"
+#~ msgstr "小"
 
-#: ../../ui/password-dialog.glade:561
-msgid "_Remember passwords"
-msgstr "パスワードを保存(_R)"
+#~ msgid "Storage"
+#~ msgstr "ストレージ"
 
-#: ../../src/client/ui/stock.vala:30
-msgid "_Remove"
-msgstr "削除(_R)"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "取り消し線(Ctrl+K)"
 
-#: ../../src/client/geary-controller.vala:1496
-msgid "_Replace"
-msgstr "置換(_R)"
+#~ msgid "To add them as attachments"
+#~ msgstr "添付ファイルとして追加"
 
-#: ../../src/client/geary-controller.vala:317
-#: ../../src/client/views/conversation-viewer.vala:1447
-msgid "_Reply"
-msgstr "返信(_R)"
+#~ msgid "Unable to login to email server"
+#~ msgstr "ログインに失敗しました"
 
-#: ../../ui/composer.glade:141
-msgid "_Rich Text"
-msgstr ""
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "下線(Ctrl+U)"
 
-#: ../../ui/composer.glade:47
-msgid "_Right"
-msgstr "右揃え(_R)"
+#~ msgid "User_name:"
+#~ msgstr "ユーザー名(_N):"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:31
-msgid "_Save"
-msgstr "保存(_S)"
+#~ msgid "Username:"
+#~ msgstr "ユーザー名:"
 
-#: ../../src/client/views/conversation-viewer.vala:1395
-msgid "_Save As..."
-msgstr "名前を付けて保存(_S)..."
+#~ msgid "_Attach File"
+#~ msgstr "ファイルを添付(_A)"
 
-#: ../../src/client/views/conversation-viewer.vala:1414
-msgid "_Save Image As..."
-msgstr ""
+#~ msgid "_Automatically select next message"
+#~ msgstr "自動的に次のメッセージを選択(_A)"
 
-#: ../../ui/composer.glade:594
-msgid "_Send"
-msgstr "送信(_S)"
+#~ msgid "_Center"
+#~ msgstr "中央揃え(_C)"
 
-#: ../../ui/composer.glade:163
-msgid "_Small"
-msgstr ""
+#~ msgid "_Delete"
+#~ msgstr "削除(_D)"
 
-#: ../../src/client/geary-controller.vala:289
-msgid "_Star"
-msgstr "スター(_S)"
+#~ msgid "_Details"
+#~ msgstr "詳細(_D)"
 
-#: ../../ui/composer.glade:7
-msgid "_Undo"
-msgstr ""
+#~ msgid "_Download mail:"
+#~ msgstr "メールをダウンロード(_D):"
 
-#: ../../ui/login.glade:522
-msgid "_Username:"
-msgstr "ユーザー名(_U):"
+#~ msgid "_Justify"
+#~ msgstr "両端揃え(_J)"
 
-#: ../../src/client/views/conversation-viewer.vala:1494
-msgid "_View Source"
-msgstr "ソースを表示(_V)"
+#~ msgid "_Left"
+#~ msgstr "左揃え(_L)"
 
-#. / 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 ""
+#~ msgid "_Password:"
+#~ msgstr "パスワード(_P):"
 
-#: ../../src/client/views/conversation-viewer.vala:1148
-msgid "but actually goes to"
-msgstr ""
+#~ msgid "_Play notification sounds"
+#~ msgstr "通知音を再生(_P)"
 
-#: ../../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "バイト"
+#~ msgid "_Remember passwords"
+#~ msgstr "パスワードを保存(_R)"
 
-#. / Placeholder filename for attachments with no filename.
-#: ../../src/client/views/conversation-viewer.vala:1799
-#: ../../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "無題"
+#~ msgid "_Right"
+#~ msgstr "右揃え(_R)"
 
-#: ../../src/client/views/conversation-find-bar.vala:226
-msgid "not found"
-msgstr ""
+#~ msgid "_Send"
+#~ msgstr "送信(_S)"
 
-#. / Translators: add your name and email address to receive credit in the About dialog
-#. / For example: Yamada Taro <yamada taro example com>
-#: ../../src/client/geary-controller.vala:1230
-msgid "translator-credits"
-msgstr "Minato Kanzaki <pikadcolon gmail com>"
+#~ msgid "_Username:"
+#~ msgstr "ユーザー名(_U):"
diff --git a/po/kk.po b/po/kk.po
index 67c9688..ce52875 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -6,263 +6,252 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-03-15 05:54+0000\n"
-"PO-Revision-Date: 2015-03-15 22:53+0500\n"
-"Last-Translator: Baurzhan Muftakhidinov <baurthefirst gmail com>\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:07+0000\n"
+"Last-Translator: Baurzhan Muftakhidinov <Unknown>\n"
 "Language-Team: Kazakh <kk_KZ googlegroups com>\n"
-"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.7.3\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Пошта клиенті"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary поштасы"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Эл. поштаны жіберу және қабылдау"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Эл. пошта;электрондық пошта;е-пошта;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Хатты жазу"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Эл. поштамен жіберу"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Файлдарды Geary көмегімен жіберу"
+"X-Launchpad-Export-Date: 2015-11-23 05:55+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: kk\n"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Сақтау"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Шимай | Шимайлар | Черновики | Черновик | Drafts | Draft"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "Қо_су"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
+"Жіберілген | Отправленные | Sent | Sent Mail | Sent Email | Sent E-Mail"
 
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "%s үшін қосымша адрестер"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+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"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Тіркелгілер"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Қоқыс | Қоқыс шелегі | Корзина | Trash | Rubbish | Rubbish Bin"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Аты Фамилиясы"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Welcome to Geary."
-msgstr "Geary қолданбасына қош келдіңіз."
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Кіріс"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Enter your account information to get started."
-msgstr "Бастау үшін тіркелгі ақпаратыңызды енгізіңіз."
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Шимайлар"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "2 weeks back"
-msgstr "2 апта бұрын"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Жіберілген хаттар"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "1 month back"
-msgstr "1 ай бұрын"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Жұлдызшалы"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "3 months back"
-msgstr "3 ай бұрын"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Маңызды"
 
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "6 months back"
-msgstr "6 ай бұрын"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Барлық пошта"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "1 year back"
-msgstr "1 жыл бұрын"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Спам"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-msgid "2 years back"
-msgstr "2 жыл бұрын"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Қоқыс шелегі"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-msgid "4 years back"
-msgstr "4 жыл бұрын"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Шығыс"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "Everything"
-msgstr "Барлығы"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Іздеу"
 
-#: ../src/client/accounts/add-edit-page.vala:280
-msgid "Edit"
-msgstr "Түзету"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Архив"
 
-#: ../src/client/accounts/add-edit-page.vala:282
-msgid "Preview"
-msgstr "Алдын-ала қарау"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Ешнәрсе"
 
-#: ../src/client/accounts/add-edit-page.vala:723
-msgid "Remem_ber passwords"
-msgstr "Парольдерді есте сақ_тау"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "Парольді есте сақ_тау"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:764
-msgid "Unable to validate:\n"
-msgstr "Тексеру сәтсіз аяқталды:\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:766
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Тіркелгінің ник аты қате.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:769
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; Эл. пошта адресі Geary-ге бұрын қосылған.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:773
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP байланысу қатесі.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Басқа"
 
-#: ../src/client/accounts/add-edit-page.vala:776
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; IMAP пайдаланушы аты не паролі қате.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "салыным"
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP байланысу қатесі.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "жасырын көшірме"
 
-#: ../src/client/accounts/add-edit-page.vala:782
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; SMTP пайдаланушы аты не паролі қате.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "денесі"
 
-#: ../src/client/accounts/add-edit-page.vala:786
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Байланыс қатесі.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "көшірме"
 
-#: ../src/client/accounts/add-edit-page.vala:790
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Пайдаланушы аты не паролі қате.\n"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "кімнен"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011-2015 Yorba Foundation"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "Тақырып"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Yorba веб сайтын шолу"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "кімге"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Geary қолданбасын жасырылған басты тереземен іске қосу"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "мен"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Жөндеу ақпаратын көрсету"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(тақырыпсыз)"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Сөйлесулерді бақылауды журналдау"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %b %-e, %Y күні, уақыты %H:%M"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Желілік десериализациясын журналдау"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "%1$s, %2$s жазған:"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Желілік белсенділікті журналдау"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s жазған:"
 
-#. / 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 "IMAP қайта ойнату тізбегін журналдау"
+#. / 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:234
+msgid "On %s:"
+msgstr "%s:"
 
-#. / 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 "Желілік сериализациясын журналдау"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Қайта бағдарланған хат ----------"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Мезгіл-мезгіл белсенділікті журналдау"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Кімнен: %s\n"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Дерекқор сұранымдарын журналдау (көптеген хабарламаларды туғызады)"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Тақырып: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Бумалар синхронизациясын журналдау"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Күні: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "WebView бақылауды рұқсат ету"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Кімге: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "TLS ескертулері бар барлық сервер сертификаттарын қайта шақыру"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Көшірмесі: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Бағдарлама нұсқасын көрсету"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "жоқ"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Жаңа хатты жазу терезесін ашу үшін %s қолданыңыз"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Пошта клиенті"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Пікірлер, ұсыныстар және ақаулықтарды хабарлау жері:"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "Copyright 2011-2015 Yorba Foundation"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Командалық жол опцияларын талдау сәтсіз аяқталды: %s\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Yorba веб сайтын шолу"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Белгісіз командалық жол опциясы \"%s\"\n"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
 #: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
@@ -272,7 +261,6 @@ msgstr "Сөйлесуді өшіру (Shift+Delete)"
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Сөйлесулерді өшіру (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
 #: ../src/client/application/geary-controller.vala:67
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Сөйлесуді қоқыс шелегіне тастау (Delete, Backspace)"
@@ -281,7 +269,6 @@ msgstr "Сөйлесуді қоқыс шелегіне тастау (Delete, Bac
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "Сөйлесудерді қоқыс шелегіне тастау (Delete, Backspace)"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
 #: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Архив"
@@ -303,7 +290,7 @@ msgid "Mark as not S_pam"
 msgstr "С_пам емес етіп белгілеу"
 
 #: ../src/client/application/geary-controller.vala:80
-#: ../src/client/application/geary-controller.vala:394
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Сөйлесуді белгілеу"
 
@@ -320,7 +307,7 @@ msgid "Add label to conversations"
 msgstr "Сөйлесулерге белгіні қосу"
 
 #: ../src/client/application/geary-controller.vala:84
-#: ../src/client/application/geary-controller.vala:433
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Сөйлесуді жылжыту"
 
@@ -328,128 +315,121 @@ msgstr "Сөйлесуді жылжыту"
 msgid "Move conversations"
 msgstr "Сөйлесулерді жылжыту"
 
-#: ../src/client/application/geary-controller.vala:370
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "_Тіркелгілер"
 
-#: ../src/client/application/geary-controller.vala:375
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "Ба_птаулар"
 
-#: ../src/client/application/geary-controller.vala:379
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Көмек"
 
-#: ../src/client/application/geary-controller.vala:383
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "Осы тур_алы"
 
-#: ../src/client/application/geary-controller.vala:387
-msgid "_Donate"
-msgstr "Ақ_шалай көмектесу"
-
-#: ../src/client/application/geary-controller.vala:391
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Шығу"
 
-#: ../src/client/application/geary-controller.vala:396
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "Қалайша _белгілеу..."
 
-#: ../src/client/application/geary-controller.vala:402
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Оқ_ылған етіп белгілеу"
 
-#: ../src/client/application/geary-controller.vala:408
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Оқыл_маған етіп белгілеу"
 
-#: ../src/client/application/geary-controller.vala:414
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Жұлдызшаны орнату"
 
-#: ../src/client/application/geary-controller.vala:419
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "Жұлдызшаны алы_п тастау"
 
-#: ../src/client/application/geary-controller.vala:429
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Белгіні қосу"
 
-#: ../src/client/application/geary-controller.vala:430
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "Ж_азу"
 
-#: ../src/client/application/geary-controller.vala:434
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "Жы_лжыту"
 
-#: ../src/client/application/geary-controller.vala:438
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Жаңа хатты жазу (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:442
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "Жауап бе_ру"
 
-#: ../src/client/application/geary-controller.vala:443
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Жауап беру (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:447
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "Барлығына жауап б_еру"
 
-#: ../src/client/application/geary-controller.vala:448
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Барлығына жауап беру (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:453
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "Қа_йта бағдарлау"
 
-#: ../src/client/application/geary-controller.vala:454
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Қайта бағдарлау (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:492
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr "Босату"
 
-#: ../src/client/application/geary-controller.vala:493
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr "Спам немесе Қоқыс шелегі бумаларын босату"
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr "_Спам бумасын босату…"
 
-#: ../src/client/application/geary-controller.vala:501
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr "Қ_оқыс шелегін босату…"
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:534
+#: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
 msgstr "Іздеу панелін іске қосу/сөндіру"
 
-#: ../src/client/application/geary-controller.vala:748
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Серверге сену ережесін сақтау қатесі"
 
-#: ../src/client/application/geary-controller.vala:985
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Сіздің баптауларыңыз қауіпсіз емес"
 
-#: ../src/client/application/geary-controller.vala:986
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -459,17 +439,17 @@ msgstr ""
 "Бұл дегеніміз, сіздің пайдаланушы аты мен пароліңіз желідегі басқа адам біле "
 "алады. Осыны жасауды шынымен қалайсыз ба?"
 
-#: ../src/client/application/geary-controller.vala:987
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "Жалғ_астыру"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1065
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Хатты жіберу сәтсіз"
 
-#: ../src/client/application/geary-controller.vala:1066
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -477,14 +457,12 @@ msgstr ""
 "Geary хатты жібергенде қате орын алды. Егер мәселе қайталана берсе, хатты "
 "қолмен Шығыс бумасынан өшіріңіз."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1070
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Жіберліген хаттын сақтау сәтсіз"
 
-#: ../src/client/application/geary-controller.vala:1071
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -492,20 +470,15 @@ msgstr ""
 "Geary жіберілген хатты Жіберілген хаттар бумасына сақтау кезінде қате орын "
 "алды. Бұл хат сіз оны қолмен өшірілгенге дейін Шығыс бумасында қала береді."
 
-#: ../src/client/application/geary-controller.vala:1140
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Белгілер"
 
-#. 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:1152
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "%s үшін дерекқорды ашу мүмкін емес"
 
-#: ../src/client/application/geary-controller.vala:1153
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -528,21 +501,19 @@ msgstr ""
 "Дерекқорды қайта құрастыру барлық жергілікті пошта хаттар және салынымдарын "
 "жояды. <b>Сервердегі поштаға әсері болмайды.</b>"
 
-#: ../src/client/application/geary-controller.vala:1155
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "Қа_йта құрастыру"
 
-#: ../src/client/application/geary-controller.vala:1155
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "_Шығу"
 
-#: ../src/client/application/geary-controller.vala:1164
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "\"%s\" үшін дерекқорды қайта құрастыру мүмкін емес"
 
-#: ../src/client/application/geary-controller.vala:1165
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -552,17 +523,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1187
-#: ../src/client/application/geary-controller.vala:1197
-#: ../src/client/application/geary-controller.vala:1208
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "%s үшін жергілікті эл. пошта жәшігін ашу мүмкін емес"
 
-#: ../src/client/application/geary-controller.vala:1188
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -580,7 +547,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1198
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -595,7 +562,7 @@ msgstr ""
 "\n"
 "Geary қолданбасының соңғы нұсқасын орнатып, қайталап көріңіз."
 
-#: ../src/client/application/geary-controller.vala:1209
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -607,27 +574,29 @@ msgstr ""
 "\n"
 "Желілік байланысыңызды тексеріп, Geary қолданбасын қайта іске қосыңыз."
 
-#: ../src/client/application/geary-controller.vala:1717
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "%s туралы"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1720
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
-msgstr "Baurzhan Muftakhidinov <baurthefirst gmail com>"
+msgstr ""
+"Baurzhan Muftakhidinov <baurthefirst gmail com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Baurzhan Muftakhidinov https://launchpad.net/~baurthefirst";
 
-#: ../src/client/application/geary-controller.vala:1986
+#: ../src/client/application/geary-controller.vala:1976
 msgid "Undo move (Ctrl+Z)"
 msgstr "Жылжытуды болдырмау (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:1996
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "\"%s\" ашуды шынымен қалайсыз ба?"
 
-#: ../src/client/application/geary-controller.vala:1997
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -635,295 +604,517 @@ msgstr ""
 "Салынымдар ашылса, жүйеңіздге зақым келтіруі мүмкін. Тек сенімді "
 "жіберушілерден салынымдарды ашыңыз."
 
-#: ../src/client/application/geary-controller.vala:1998
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "М_ені қайта сұрамау"
 
-#: ../src/client/application/geary-controller.vala:2016
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr ""
 "\"%s\" деп аталатын файл бар болып тұр. Оны үстінен жазуды қалайсыз ба?"
 
-#: ../src/client/application/geary-controller.vala:2018
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "Файл \"%s\" ішінде бар болып тұр.  Оны ауыстырсаңыз, құрамы үстінен жазылады."
 
-#: ../src/client/application/geary-controller.vala:2021
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "А_лмастыру"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2319
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Ашық шимай хаттарды жабу керек пе?"
 
-#: ../src/client/application/geary-controller.vala:2449
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr "Барлық хаттарды сіздің %s бумаңыздан босату керек пе?"
 
-#: ../src/client/application/geary-controller.vala:2450
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr ""
 "Бұл әрекет бұл эл. пошта хатын Geary ішінен және эл. пошта серверінен де "
 "өшіреді."
 
-#: ../src/client/application/geary-controller.vala:2451
+#: ../src/client/application/geary-controller.vala:2441
 msgid "This cannot be undone."
 msgstr "Бұны болдырмау мүмкін емес болады."
 
-#: ../src/client/application/geary-controller.vala:2452
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr "%s босату"
 
-#: ../src/client/application/geary-controller.vala:2469
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 msgid "Error emptying %s"
 msgstr "%s босату сәтсіз аяқталды"
 
-#: ../src/client/application/geary-controller.vala:2499
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Бұл хат(тар)ды толығымен өшіруді қалайсыз ба?"
 
-#: ../src/client/application/geary-controller.vala:2501
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Өшіру"
 
-#: ../src/client/application/geary-controller.vala:2532
+#: ../src/client/application/geary-controller.vala:2522
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Архивтеуді болдырмау (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2547
+#: ../src/client/application/geary-controller.vala:2537
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Қоқыс шелегіне тастауды болдырмау (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2600
+#: ../src/client/application/geary-controller.vala:2590
 msgid "Undo (Ctrl+Z)"
 msgstr "Болдырмау (Ctrl+Z)"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i сәйкестік"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Geary қолданбасын жасырылған басты тереземен іске қосу"
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i сәйкестік (тасымалданған)"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Жөндеу ақпаратын көрсету"
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "табылмады"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Сөйлесулерді бақылауды журналдау"
 
-#: ../src/client/components/main-window.vala:420
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Желілік десериализациясын журналдау"
 
-#: ../src/client/components/search-bar.vala:10
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Іздеу"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Желілік белсенділікті журналдау"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:25
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Тіркелгінің барлық хаттарынан кілтсөзді іздеу (Ctrl+S)"
+#. / 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 "IMAP қайта ойнату тізбегін журналдау"
 
-#: ../src/client/components/search-bar.vala:118
-#, c-format
-msgid "Indexing %s account"
-msgstr "%s тіркелгісін индекстеу"
+#. / 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 "Желілік сериализациясын журналдау"
 
-#: ../src/client/components/search-bar.vala:129
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "%s тіркелгісінен іздеу"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Мезгіл-мезгіл белсенділікті журналдау"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Жіберуде..."
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Дерекқор сұранымдарын журналдау (көптеген хабарламаларды туғызады)"
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "О_К"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Бумалар синхронизациясын журналдау"
 
-#: ../src/client/components/stock.vala:19
-#: ../ui/edit_alternate_emails.glade.h:3 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "Ба_с тарту"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "WebView бақылауды рұқсат ету"
 
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Жабу"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "TLS ескертулері бар барлық сервер сертификаттарын қайта шақыру"
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Елемеу"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Бағдарлама нұсқасын көрсету"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Ашу"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Жаңа хатты жазу терезесін ашу үшін %s қолданыңыз"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "Бас_паға шығару..."
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Пікірлер, ұсыныстар және ақаулықтарды хабарлау жері:"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "Ө_шіру"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Командалық жол опцияларын талдау сәтсіз аяқталды: %s\n"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "Барлығын _таңдау"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Белгісіз командалық жол опциясы \"%s\"\n"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "Ұс_тау"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - жаңа хаттар"
 
-#: ../src/client/composer/composer-widget.vala:72
-msgid "Saved"
-msgstr "Сақталды"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d жаңа хат"
 
-#: ../src/client/composer/composer-widget.vala:73
-msgid "Saving"
-msgstr "Сақталуда"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d жалпы жаңа хат"
 
-#: ../src/client/composer/composer-widget.vala:74
-msgid "Error saving"
-msgstr "Сақтау қатесі"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d басқа жаңа хат, %s үшін)"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "Press Backspace to delete quote"
-msgstr "Дәйексөзді өшіру үшін Backspace басыңыз"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Ашу"
 
-#: ../src/client/composer/composer-widget.vala:76
-msgid "New Message"
-msgstr "Жаңа хат"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Мен"
 
-#. A 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:137
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr "Сенімсіз байланыс: %s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr "%s пошта серверінің (адресі %s:%u) шындылығын растау мүмкін емес."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
 msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
-"салыным|салынымды|салып|салдым|салынған|қосып|attach|attaching|attaches|"
-"attachment|attachments|attached|enclose|enclosed|enclosing|encloses|"
-"enclosure|enclosures"
+"\"Бұл серверге сену\" немесе \"Бұл серверге  әрқашан сену\" таңдасаңыз, "
+"пайдаланушы аты және пароль желі арқылы қауіпсіз емес түрде берілуі мүмкін."
 
-#: ../src/client/composer/composer-widget.vala:1101
-#: ../src/client/composer/composer-widget.vala:1105
-msgid "Do you want to discard this message?"
-msgstr "Бұл хатты елемеуді қалайсыз ба?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"\"Бұл серверге сенбеу\" таңдасаңыз, Geary бұл серверге байланыспайтын болады."
 
-#: ../src/client/composer/composer-widget.vala:1261
-msgid "Send message with an empty subject and body?"
-msgstr "Хатты бос тақырыппен және бос денесімен жіберу керек пе?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Geary бұл эл. пошта тіркелгісін қоспайды не жаңартпайды."
 
-#: ../src/client/composer/composer-widget.vala:1263
-msgid "Send message with an empty subject?"
-msgstr "Хатты бос тақырыппен жіберу керек пе?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"\"Бұл серверге сенбеу\" таңдасаңыз, Geary бұл тіркелгіге енді байланыспайтын "
+"болады."
 
-#: ../src/client/composer/composer-widget.vala:1265
-msgid "Send message with an empty body?"
-msgstr "Хатты бос денесімен жіберу керек пе?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
+"Сізде басқа ашық эл. пошта тіркелгілері жоқ болса, Geary өз жұмысын аяқтайды."
 
-#: ../src/client/composer/composer-widget.vala:1267
-msgid "Send message without an attachment?"
-msgstr "Хатты салынымсыз жіберу керек пе?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Бұл мәселелер жөнінде сұрақтарыңыз бар болса, жүйелік әкімші немесе эл. "
+"поштаны ұсынушыға хабарласыңыз."
 
-#: ../src/client/composer/composer-widget.vala:1529
-msgid "Cannot add attachment"
-msgstr "Салынымды қосу мүмкін емес"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr "Сервер сертикатына қолтаңбаны қойған сертификаттау орталығы белгісіз"
 
-#: ../src/client/composer/composer-widget.vala:1540
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "\"%s\" табу мүмкін емес."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr "Сертификат өзі алынған сайттың күтілген анықтағышына сәйкес келмейді"
 
-#: ../src/client/composer/composer-widget.vala:1547
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" бума болып тұр."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Сервекр сертификаттың мерзімі аяқталған"
 
-#: ../src/client/composer/composer-widget.vala:1554
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" бос файл болып тұр."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "Сервер сертификаты белсендірілмеген"
 
-#: ../src/client/composer/composer-widget.vala:1568
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "\"%s\" оқу үшін ашу мүмкін емес."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "Сервер сертификаты қайта шақырылған және қазір жарамсыз болып тұр"
 
-#: ../src/client/composer/composer-widget.vala:1575
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" салыным ретінде белгіленіп тұр."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "Сертификат алгоритмі қауіпсіз емес ретінде саналады"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1584
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr "Сервер сертификатын өңдеу кезінде қате орын алды"
 
-#: ../src/client/composer/composer-widget.vala:1644
-msgid "To: "
-msgstr "Кімге:"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr "Geary жалғастыру үшін эл. пошта пароліңізді талап етеді"
 
-#: ../src/client/composer/composer-widget.vala:1647
-msgid "Cc: "
-msgstr "Көшірмесі:"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Файлды таңдау"
 
-#: ../src/client/composer/composer-widget.vala:1650
-msgid "Bcc: "
-msgstr "Жасырын көшірме:"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "Салынымды қ_осып жіберу"
 
-#: ../src/client/composer/composer-widget.vala:1653
-msgid "Reply-To: "
-msgstr "Жауап беру:"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr "%s үшін қосымша адрестер"
 
-#: ../src/client/composer/composer-widget.vala:1886
-msgid "Select Color"
-msgstr "Түсті таңдаңыз"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Тіркелгілер"
 
-#. 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:2321
-#, c-format
-msgid "%1$s via %2$s"
-msgstr "%1$s, %2$s арқылы"
+#. / 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 "Аты Фамилиясы"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2363
-msgid "_From:"
-msgstr "_Кімнен:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Geary қолданбасына қош келдіңіз."
+
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Бастау үшін тіркелгі ақпаратыңызды енгізіңіз."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 апта бұрын"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 ай бұрын"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 ай бұрын"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 ай бұрын"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 жыл бұрын"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "2 жыл бұрын"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "4 жыл бұрын"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Барлығы"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "Түзету"
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr "Алдын-ала қарау"
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "Парольдерді есте сақ_тау"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "Парольді есте сақ_тау"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Тексеру сәтсіз аяқталды:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Тіркелгінің ник аты қате.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Эл. пошта адресі Geary-ге бұрын қосылған.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; IMAP байланысу қатесі.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; IMAP пайдаланушы аты не паролі қате.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; SMTP байланысу қатесі.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; SMTP пайдаланушы аты не паролі қате.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Байланыс қатесі.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Пайдаланушы аты не паролі қате.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Сақтау"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "Қо_су"
+
+#. / 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 "%H:%M"
+
+#. / 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 "%b %-e"
+
+#. / 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 "%B %-e, %Y %H:%M"
+
+#. / 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"
+
+#. / 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 "%B %-e, %Y %H:%M"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Қазір"
+
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "%dмин бұрын"
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "%dсағ бұрын"
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Кеше"
+
+#. / 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
+msgid "%A"
+msgstr "%A"
+
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "байт"
+
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "ТБ"
+
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "ГБ"
+
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "МБ"
+
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "КБ"
+
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d хабарлама"
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d оқылмаған"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Кіріс хаттар бумалары"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "%s тіркелгісінен іздеу"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d нәтиже"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "Бірде-бір сөйлесу таңдалмады."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "%u сөйлесу таңдалды."
@@ -977,40 +1168,36 @@ msgid "Date:"
 msgstr "Күні:"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "%u оқылған хат"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr ""
 "Бұл хабарлама сәтті жіберілді, бірақ оны %s бумасына сақтау мүмкін емес."
 
-#. Add a menu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Көшіру"
 
-#. Add a menu item for copying the address.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "Эл. пошта а_дресін көшіру"
 
-#. Add a menu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "_Сілтемені көшіріп алу"
 
-#. Select message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "_Хатты таңдау"
 
-#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Барлығын _таңдау"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "_Бақылау"
@@ -1023,7 +1210,6 @@ msgstr "Бұл сілтеме осы жерге көрсетіп тұрған с
 msgid "but actually goes to"
 msgstr "бірақ, шын мәнінде мына жерге сілтейді:"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
 msgstr " (Жарамсыз?)"
@@ -1045,12 +1231,10 @@ msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] "Салы_нымдарды сақтау..."
 
-#. Reply to all on a message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "Б_арлығына жауап беру"
 
-#. Mark as read/unread.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "Оқылған етіп бел_гілеу"
@@ -1063,1050 +1247,616 @@ msgstr "Оқылмаған етіп бел_гілеу"
 msgid "Mark Unread From _Here"
 msgstr "Ос_ыдан бастап оқылмаған етіп белгілеу"
 
-#. Separator.
-#. View original message source.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "Бастапқы кодын қ_арау"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:378
-msgid "none"
-msgstr "жоқ"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "Үнсіз келісім бойынша мәтіндік түзеткішін ашу сәтсіз аяқталды."
 
 #: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s - Сөйлесулер бақылаушысы"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Файлды таңдау"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Сақталды"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "Салынымды қ_осып жіберу"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Сақталуда"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
-msgid "Untrusted Connection: %s"
-msgstr "Сенімсіз байланыс: %s"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Сақтау қатесі"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
-msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr "%s пошта серверінің (адресі %s:%u) шындылығын растау мүмкін емес."
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "Дәйексөзді өшіру үшін Backspace басыңыз"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
-msgid ""
-"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-"your username and password to be transmitted insecurely."
-msgstr ""
-"\"Бұл серверге сену\" немесе \"Бұл серверге  әрқашан сену\" таңдасаңыз, "
-"пайдаланушы аты және пароль желі арқылы қауіпсіз емес түрде берілуі мүмкін."
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Жаңа хат"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-"server."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"\"Бұл серверге сенбеу\" таңдасаңыз, Geary бұл серверге байланыспайтын болады."
+"салыным|салынымды|салып|салдым|салынған|қосып|attach|attaching|attaches|attac"
+"hment|attachments|attached|enclose|enclosed|enclosing|encloses|enclosure|encl"
+"osures"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
-msgid "Geary will not add or update this email account."
-msgstr "Geary бұл эл. пошта тіркелгісін қоспайды не жаңартпайды."
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Бұл хатты елемеуді қалайсыз ба?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-"this account."
-msgstr ""
-"\"Бұл серверге сенбеу\" таңдасаңыз, Geary бұл тіркелгіге енді байланыспайтын "
-"болады."
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Хатты бос тақырыппен және бос денесімен жіберу керек пе?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr ""
-"Сізде басқа ашық эл. пошта тіркелгілері жоқ болса, Geary өз жұмысын аяқтайды."
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Хатты бос тақырыппен жіберу керек пе?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
-msgid ""
-"Contact your system administrator or email service provider if you have any "
-"question about these issues."
-msgstr ""
-"Бұл мәселелер жөнінде сұрақтарыңыз бар болса, жүйелік әкімші немесе эл. "
-"поштаны ұсынушыға хабарласыңыз."
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Хатты бос денесімен жіберу керек пе?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
-msgstr "Сервер сертикатына қолтаңбаны қойған сертификаттау орталығы белгісіз"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Хатты салынымсыз жіберу керек пе?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
-msgid "The server's identity does not match the identity in the certificate"
-msgstr "Сертификат өзі алынған сайттың күтілген анықтағышына сәйкес келмейді"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Салынымды қосу мүмкін емес"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
-msgid "The server's certificate has expired"
-msgstr "Сервекр сертификаттың мерзімі аяқталған"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "\"%s\" табу мүмкін емес."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
-msgid "The server's certificate has not been activated"
-msgstr "Сервер сертификаты белсендірілмеген"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" бума болып тұр."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
-msgid "The server's certificate has been revoked and is now invalid"
-msgstr "Сервер сертификаты қайта шақырылған және қазір жарамсыз болып тұр"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" бос файл болып тұр."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
-msgid "The server's certificate is considered insecure"
-msgstr "Сертификат алгоритмі қауіпсіз емес ретінде саналады"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "\"%s\" оқу үшін ашу мүмкін емес."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
-msgid "An error has occurred processing the server's certificate"
-msgstr "Сервер сертификатын өңдеу кезінде қате орын алды"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "\"%s\" салыным ретінде белгіленіп тұр."
 
-#. 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 "Geary requires your email password to continue"
-msgstr "Geary жалғастыру үшін эл. пошта пароліңізді талап етеді"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. 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 хабарлама"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Кімге: "
 
-#. / 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 оқылмаған"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Көшірмесі: "
 
-#. / 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/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Жасырын көшірме: "
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Кіріс хаттар бумалары"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "Жауап беру: "
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d нәтиже"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Түсті таңдаңыз"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - жаңа хаттар"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr "%1$s, %2$s арқылы"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d жаңа хат"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_Кімнен:"
 
-#: ../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 жалпы жаңа хат"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 басқа жаңа хат, %s үшін)"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Жіберуде..."
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Ашу"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i сәйкестік"
 
-#. / 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 "%H:%M"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i сәйкестік (тасымалданған)"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "табылмады"
 
-#. / 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"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "О_К"
 
-#. / 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 "%b %-e"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "Ба_с тарту"
 
-#. / 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"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Жабу"
 
-#. / 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 "%B %-e, %Y %H:%M"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Елемеу"
 
-#. / 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"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Ашу"
 
-#. / 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 "%B %-e, %Y %H:%M"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "Бас_паға шығару..."
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Қазір"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "Ө_шіру"
 
-#: ../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "%dмин бұрын"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "Ұс_тау"
 
-#: ../src/client/util/util-date.vala:171
-#, c-format
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "%dсағ бұрын"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Тіркелгінің барлық хаттарынан кілтсөзді іздеу (Ctrl+S)"
 
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "Кеше"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "%s тіркелгісін индекстеу"
 
-#. / 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"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(тақырыпсыз)"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary поштасы"
 
-#: ../src/client/util/util-email.vala:87
-msgid "Me"
-msgstr "Мен"
+#~ msgid "Send and receive email"
+#~ msgstr "Эл. поштаны жіберу және қабылдау"
 
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "байт"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Эл. пошта;электрондық пошта;е-пошта;"
 
-#: ../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "ТБ"
+#~ msgid "Compose Message"
+#~ msgstr "Хатты жазу"
 
-#: ../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "ГБ"
+#~ msgid "Send by email"
+#~ msgstr "Эл. поштамен жіберу"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "МБ"
+#~ msgid "Send files using Geary"
+#~ msgstr "Файлдарды Geary көмегімен жіберу"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "КБ"
+#~ msgid "_Donate"
+#~ msgstr "Ақ_шалай көмектесу"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Тіркелгіні өшіру мүмкін емес</span> "
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Бұл тіркелгімен сәйкестелген жаңа хатты жазу терезесі ашық болып тұр. Хатты "
+#~ "жіберіңіз не елемеңіз, одан кейін қайталап көріңіз."
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#~ msgid "Add account"
+#~ msgstr "Тіркелгіні қосу"
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Басқа"
+#~ msgid "Edit account"
+#~ msgstr "Тіркелгіні түзету"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#~ msgid "Remove account"
+#~ msgstr "Тіркелгіні өшіру"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Geary тіркелгіңізді тексеріп болғанша дейін күте тұрыңыз."
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Кіріс"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Сенімсіз байланыс"
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Шимайлар"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "Бұл серверге әрқ_ашан сену"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Жіберілген хаттар"
+#~ msgid "_Trust This Server"
+#~ msgstr "Бұл серверге _сену"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Жұлдызшалы"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "_Бұл серверге сенбеу"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Маңызды"
+#~ msgid "_Undo"
+#~ msgstr "Бол_дырмау"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Барлық пошта"
+#~ msgid "_Redo"
+#~ msgstr "Қай_талау"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Спам"
+#~ msgid "Cu_t"
+#~ msgstr "Қ_иып алу"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Қоқыс шелегі"
+#~ msgid "_Paste"
+#~ msgstr "Кірі_стіру"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Шығыс"
+#~ msgid "_Left"
+#~ msgstr "_Сол жақтан"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Архив"
+#~ msgid "_Right"
+#~ msgstr "_Оң жақ"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-msgstr "Ешнәрсе"
+#~ msgid "_Center"
+#~ msgstr "_Ортасынан"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-msgid "attachment"
-msgstr "салыным"
+#~ msgid "_Justify"
+#~ msgstr "_Туралануы"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
-msgstr "жасырын көшірме"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Сілтеме (Ctrl+L)"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
-msgstr "денесі"
+#~ msgid "C_olor"
+#~ msgstr "_Түсі"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "cc"
-msgstr "көшірме"
+#~ msgid "More options"
+#~ msgstr "Көбірек опциялар"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
-msgstr "кімнен"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Мәтінді дәйексөз қылу (Ctrl+])"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-msgid "subject"
-msgstr "Тақырып"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Мәтінді дәйексөз емес қылу (Ctrl+])"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
-msgstr "кімге"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Пішімдеуді өшіру (Ctrl+Space)"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
-msgstr "мен"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Пішімдеу_мен кірістіру"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-msgid "Drafts | Draft"
-msgstr "Шимай | Шимайлар | Черновики | Черновик | Drafts | Draft"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Жуан (Ctrl+B)"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr ""
-"Жіберілген | Отправленные | Sent | Sent Mail | Sent Email | Sent E-Mail"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Көлбеу (Ctrl+I)"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-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"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Асты сызылған (Ctrl+U)"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Қоқыс | Қоқыс шелегі | Корзина | Trash | Rubbish | Rubbish Bin"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Сызып тастау (Ctrl+K)"
 
-#. / 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:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %b %-e, %Y күні, уақыты %H:%M"
+#~ msgid "_Rich Text"
+#~ msgstr "_Кеңейтілген пішімдеу"
 
-#. / 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:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "%1$s, %2$s жазған:"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Кеңейтілген өрістерді көрсету"
 
-#. / 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:228
-#, c-format
-msgid "%s wrote:"
-msgstr "%s жазған:"
+#~ msgctxt "Label"
+#~ msgid "Close and Save"
+#~ msgstr "Жабу және сақтау"
 
-#. / 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:234
-#, c-format
-msgid "On %s:"
-msgstr "%s:"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "Жабу және сақтау"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Қайта бағдарланған хат ----------"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "Жабу және сақтау"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "Кімнен: %s\n"
+#~ msgctxt "Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Жабу және тайдыру"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Тақырып: %s\n"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Жабу және тайдыру"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "Күні: %s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "Жабу және тайдыру"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "Кімге: %s\n"
+#~ msgid "Lar_ge"
+#~ msgstr "Үл_кен"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Көшірмесі: %s\n"
+#~ msgid "Large"
+#~ msgstr "Үлкен"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Тіркелгіні өшіру мүмкін емес</span> "
+#~ msgid "_Medium"
+#~ msgstr "О_рташа"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Бұл тіркелгімен сәйкестелген жаңа хатты жазу терезесі ашық болып тұр. Хатты "
-"жіберіңіз не елемеңіз, одан кейін қайталап көріңіз."
+#~ msgid "Medium"
+#~ msgstr "Орташа"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Тіркелгіні қосу"
+#~ msgid "_Small"
+#~ msgstr "_Кішкентай"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Тіркелгіні түзету"
+#~ msgid "Small"
+#~ msgstr "Кішкентай"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Тіркелгіні өшіру"
+#~ msgid "S_ans Serif"
+#~ msgstr "S_ans Serif"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Geary тіркелгіңізді тексеріп болғанша дейін күте тұрыңыз."
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Сенімсіз байланыс"
+#~ msgid "S_erif"
+#~ msgstr "S_erif"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "Бұл серверге әрқ_ашан сену"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "Бұл серверге _сену"
+#~ msgid "_Fixed Width"
+#~ msgstr "Бе_кітілген ені"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "_Бұл серверге сенбеу"
+#~ msgid "Fixed Width"
+#~ msgstr "Бекітілген ені"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "Бол_дырмау"
-
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "Қай_талау"
-
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "Қ_иып алу"
-
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "Кірі_стіру"
-
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Сол жақтан"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Оң жақ"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Ортасынан"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Туралануы"
-
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Сілтеме (Ctrl+L)"
-
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "_Түсі"
-
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Көбірек опциялар"
-
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Мәтінді дәйексөз қылу (Ctrl+])"
-
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Мәтінді дәйексөз емес қылу (Ctrl+])"
-
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Пішімдеуді өшіру (Ctrl+Space)"
-
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Пішімдеу_мен кірістіру"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Жуан (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Көлбеу (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Асты сызылған (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Сызып тастау (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "_Кеңейтілген пішімдеу"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Кеңейтілген өрістерді көрсету"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "Жабу және сақтау"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "Жабу және сақтау"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "Жабу және сақтау"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "Жабу және тайдыру"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "Жабу және тайдыру"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "Жабу және тайдыру"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "Үл_кен"
-
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "Үлкен"
-
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "О_рташа"
-
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "Орташа"
-
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "_Кішкентай"
-
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "Кішкентай"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
-
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "S_erif"
-
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "Serif"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "Бе_кітілген ені"
-
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "Бекітілген ені"
-
-#: ../ui/composer.glade.h:42
-msgid "Detach"
-msgstr "Бөліп жіберу"
-
-#: ../ui/composer.glade.h:43
-msgid "Detach (Ctrl+D)"
-msgstr "Бөліп жіберу (Ctrl+D)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_Жіберу"
-
-#: ../ui/composer.glade.h:45
-msgid "Send"
-msgstr "Жіберу"
-
-#: ../ui/composer.glade.h:46
-msgid "Send (Ctrl+Enter)"
-msgstr "Жіберу (Ctrl+Enter)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "Ф_айлды қосып жіберу"
-
-#: ../ui/composer.glade.h:48
-msgid "Attach File"
-msgstr "Файлды қосып жіберу"
-
-#: ../ui/composer.glade.h:49
-msgid "_Include Original Attachments"
-msgstr "Бастапқы салынымдарды қ_осып жіберу"
-
-#: ../ui/composer.glade.h:50
-msgid "Include Original Attachments"
-msgstr "Бастапқы салынымдарды қосып жіберу"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:52
-msgid "_To"
-msgstr "Кі_мге"
+#~ msgid "Detach"
+#~ msgstr "Бөліп жіберу"
 
-#: ../ui/composer.glade.h:53
-msgid "_Cc"
-msgstr "Көшірме_сі"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Бөліп жіберу (Ctrl+D)"
 
-#: ../ui/composer.glade.h:54
-msgid "_Subject"
-msgstr "_Тақырып"
+#~ msgid "_Send"
+#~ msgstr "_Жіберу"
 
-#: ../ui/composer.glade.h:55
-msgid "_Bcc"
-msgstr "_Жасырын көшірме"
+#~ msgid "Send"
+#~ msgstr "Жіберу"
 
-#: ../ui/composer.glade.h:56
-msgid "_Reply-To"
-msgstr "Жауап бе_ру"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Жіберу (Ctrl+Enter)"
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:58
-msgid "From"
-msgstr "Кімнен"
+#~ msgid "_Attach File"
+#~ msgstr "Ф_айлды қосып жіберу"
 
-#: ../ui/composer.glade.h:59
-msgid "Drop files here"
-msgstr "Файлдарды осында тастау"
+#~ msgid "Attach File"
+#~ msgstr "Файлды қосып жіберу"
 
-#: ../ui/composer.glade.h:60
-msgid "To add them as attachments"
-msgstr "Оларды салынымдар ретінде қосу үшін"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "Бастапқы салынымдарды қ_осып жіберу"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-msgid "Remove email address"
-msgstr "Эл. пошта адресін өшіру"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Бастапқы салынымдарды қосып жіберу"
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"Кейбір эл. пошта қызметтері серверде қосымша адрестердің бапталуын талап "
-"етеді. Көбірек білу үшін өз эл. пошта ұсынушысыңызға хабарласыңыз."
+#~ msgid "_To"
+#~ msgstr "Кі_мге"
 
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "_Жаңарту"
+#~ msgid "_Cc"
+#~ msgstr "Көшірме_сі"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Іздеу:"
+#~ msgid "_Subject"
+#~ msgstr "_Тақырып"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "А_лдыңғы"
+#~ msgid "_Bcc"
+#~ msgstr "_Жасырын көшірме"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Келесі"
+#~ msgid "_Reply-To"
+#~ msgstr "Жауап бе_ру"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "Регистрді _ескеру"
+#~ msgid "From"
+#~ msgstr "Кімнен"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "белгі"
+#~ msgid "Drop files here"
+#~ msgstr "Файлдарды осында тастау"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Пароль"
+#~ msgid "To add them as attachments"
+#~ msgstr "Оларды салынымдар ретінде қосу үшін"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "Эл. _пошта адресі"
+#~ msgid "Remove email address"
+#~ msgstr "Эл. пошта адресін өшіру"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Пароль"
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "Кейбір эл. пошта қызметтері серверде қосымша адрестердің бапталуын талап "
+#~ "етеді. Көбірек білу үшін өз эл. пошта ұсынушысыңызға хабарласыңыз."
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "Қ_ызмет"
+#~ msgid "_Update"
+#~ msgstr "_Жаңарту"
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "А_ты"
+#~ msgid "Find:"
+#~ msgstr "Іздеу:"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "Н_ик аты"
+#~ msgid "_Previous"
+#~ msgstr "А_лдыңғы"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Үй, Жұмыс, т.с.с."
+#~ msgid "_Next"
+#~ msgstr "_Келесі"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "Жіберілген поштаны _сақтау"
+#~ msgid "_Case sensitive"
+#~ msgstr "Регистрді _ескеру"
 
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
-msgstr "Қосы_мша эл. пошта адрестері…"
+#~ msgid "label"
+#~ msgstr "белгі"
 
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "IMAP баптаулары"
+#~ msgid "Password"
+#~ msgstr "Пароль"
 
-#: ../ui/login.glade.h:12
-msgid "Se_rver"
-msgstr "Се_рвер"
+#~ msgid "E_mail address"
+#~ msgstr "Эл. _пошта адресі"
 
-#: ../ui/login.glade.h:13
-msgid "P_ort"
-msgstr "_Порт"
+#~ msgid "_Password"
+#~ msgstr "_Пароль"
 
-#: ../ui/login.glade.h:14
-msgid "Ser_ver"
-msgstr "Сер_вер"
+#~ msgid "S_ervice"
+#~ msgstr "Қ_ызмет"
 
-#: ../ui/login.glade.h:15
-msgid "Por_t"
-msgstr "Пор_т"
+#~ msgid "N_ame"
+#~ msgstr "А_ты"
 
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "SMTP баптаулары"
+#~ msgid "N_ickname"
+#~ msgstr "Н_ик аты"
 
-#: ../ui/login.glade.h:17
-msgid "User_name"
-msgstr "Па_йдаланушы аты"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Үй, Жұмыс, т.с.с."
 
-#: ../ui/login.glade.h:18
-msgid "Pass_word"
-msgstr "Пар_оль"
+#~ msgid "_Save sent mail"
+#~ msgstr "Жіберілген поштаны _сақтау"
 
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr "SMTP пайдаланушы аты"
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "Қосы_мша эл. пошта адрестері…"
 
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr "SMTP паролі"
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP баптаулары"
 
-#: ../ui/login.glade.h:21
-msgid "_Username"
-msgstr "_Пайдаланушы аты:"
+#~ msgid "Se_rver"
+#~ msgstr "Се_рвер"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr "IMAP пайдаланушы аты"
+#~ msgid "P_ort"
+#~ msgstr "_Порт"
 
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr "IMAP паролі"
+#~ msgid "Ser_ver"
+#~ msgstr "Сер_вер"
 
-#: ../ui/login.glade.h:24
-msgid "Encr_yption"
-msgstr "_Шифрлеу"
+#~ msgid "Por_t"
+#~ msgstr "Пор_т"
 
-#: ../ui/login.glade.h:25
-msgid "Encrypt_ion"
-msgstr "Ш_ифрлеу"
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP баптаулары"
 
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "User_name"
+#~ msgstr "Па_йдаланушы аты"
 
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "Pass_word"
+#~ msgstr "Пар_оль"
 
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "Аутентификация керек е_мес"
+#~ msgid "SMTP username"
+#~ msgstr "SMTP пайдаланушы аты"
 
-#: ../ui/login.glade.h:30
-msgid "Use IMAP cre_dentials"
-msgstr "IMAP тіркелгі _деректерін қолдану"
+#~ msgid "SMTP password"
+#~ msgstr "SMTP паролі"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Хатты жазу терезесі"
+#~ msgid "_Username"
+#~ msgstr "_Пайдаланушы аты:"
 
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr "Ши_май хаттарды серверде сақату"
+#~ msgid "IMAP username"
+#~ msgstr "IMAP пайдаланушы аты"
 
-#: ../ui/login.glade.h:33
-msgid "Si_gn emails (HTML allowed):"
-msgstr "Эл. пошта хаттарына қол_таңбаны қою (HTML рұқсат етілген):"
+#~ msgid "IMAP password"
+#~ msgstr "IMAP паролі"
 
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "Сақтау құрылғылары"
+#~ msgid "Encr_yption"
+#~ msgstr "_Шифрлеу"
 
-#: ../ui/login.glade.h:35
-msgid "_Download mail"
-msgstr "_Поштаны жүктеп алу"
+#~ msgid "Encrypt_ion"
+#~ msgstr "Ш_ифрлеу"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "SMTP тіркелгі ақпараты"
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "Пайдаланушы аты"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "Парольді есте сақ_тау"
+#~ msgid "No authentication re_quired"
+#~ msgstr "Аутентификация керек е_мес"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Аутентификация"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "IMAP тіркелгі _деректерін қолдану"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Оқу"
+#~ msgid "Composer"
+#~ msgstr "Хатты жазу терезесі"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "Келесі хатты _автотаңдау"
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Ши_май хаттарды серверде сақату"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "Сөйлесудің алдын-ала көрінісін көр_сету"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "Эл. пошта хаттарына қол_таңбаны қою (HTML рұқсат етілген):"
 
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr "_Ағаш тектес панель көрінісін қолдану"
+#~ msgid "Storage"
+#~ msgstr "Сақтау құрылғылары"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "Е_млені тексеруді іске қосу"
+#~ msgid "_Download mail"
+#~ msgstr "_Поштаны жүктеп алу"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "Хабарламалар"
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP тіркелгі ақпараты"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "Хабарлау дыбы_старын ойнату"
+#~ msgid "Username"
+#~ msgstr "Пайдаланушы аты"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "Жаңа хаттар үшін _хабарламаларды көрсету"
+#~ msgid "_Remember password"
+#~ msgstr "Парольді есте сақ_тау"
 
-#: ../ui/preferences.glade.h:10
-msgid "Always _watch for new mail"
-msgstr "Жаңа хаттар келгенін _бақылау"
+#~ msgid "_Authenticate"
+#~ msgstr "_Аутентификация"
 
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr "Geary фонда орындалып, жаңа түскен хаттар жөнінде хабарлайды"
+#~ msgid "Reading"
+#~ msgstr "Оқу"
 
-#: ../ui/preferences.glade.h:12
-msgid "Preferences"
-msgstr "Баптаулар"
+#~ msgid "_Automatically select next message"
+#~ msgstr "Келесі хатты _автотаңдау"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Бұл тіркелгіні өшіруді шынымен "
-"қалайсыз ба?</span> "
+#~ msgid "_Display conversation preview"
+#~ msgstr "Сөйлесудің алдын-ала көрінісін көр_сету"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Бұл тіркелгімен байланысқан барлық эл. пошта хаттары компьютеріңізден "
-"өшірілетін болады. Бірақ, сервердегі хаттарға әсері болмайды."
+#~ msgid "Use _three pane view"
+#~ msgstr "_Ағаш тектес панель көрінісін қолдану"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Е_млені тексеруді іске қосу"
+
+#~ msgid "Notifications"
+#~ msgstr "Хабарламалар"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "Хабарлау дыбы_старын ойнату"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Жаңа хаттар үшін _хабарламаларды көрсету"
+
+#~ msgid "Always _watch for new mail"
+#~ msgstr "Жаңа хаттар келгенін _бақылау"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr "Geary фонда орындалып, жаңа түскен хаттар жөнінде хабарлайды"
+
+#~ msgid "Preferences"
+#~ msgstr "Баптаулар"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Бұл тіркелгіні өшіруді шынымен "
+#~ "қалайсыз ба?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Бұл тіркелгімен байланысқан барлық эл. пошта хаттары компьютеріңізден "
+#~ "өшірілетін болады. Бірақ, сервердегі хаттарға әсері болмайды."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Ник:"
+#~ msgid "Nickname:"
+#~ msgstr "Ник:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Эл. пошта адресі:"
+#~ msgid "Email address:"
+#~ msgstr "Эл. пошта адресі:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Geary жаңартуы жүруде…"
+#~ msgid "Geary update in progress…"
+#~ msgstr "Geary жаңартуы жүруде…"
 
 #~ msgid "_Delete"
 #~ msgstr "Ө_шіру"
diff --git a/po/km.po b/po/km.po
index 70ffef5..fe40fdc 100644
--- a/po/km.po
+++ b/po/km.po
@@ -9,1494 +9,1487 @@ 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-20 19:28+0000\n"
-"Last-Translator: yorbajim <jim yorba org>\n"
-"Language-Team: Khmer (Cambodia) (http://www.transifex.com/projects/p/geary/";
-"language/km_KH/)\n"
-"Language: km_KH\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:07+0000\n"
+"Last-Translator: Jim Nelson <jim yorba org>\n"
+"Language-Team: Khmer (Cambodia) "
+"(http://www.transifex.com/projects/p/geary/language/km_KH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:55+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: km_KH\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:641
-msgid "        &#8226; Connection error.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:624
-msgid "        &#8226; Email address already added to Geary.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:628
-msgid "        &#8226; IMAP connection error.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:631
-msgid "        &#8226; IMAP username or password incorrect.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:621
-msgid "        &#8226; Invalid account nickname.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:634
-msgid "        &#8226; SMTP connection error.\n"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "ប្រអប់​ទទួល"
 
-#: ../../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "សេចក្ដី​ព្រាង"
 
-#: ../../src/client/accounts/add-edit-page.vala:645
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "អ៊ីមែលផ្ញើ​ហើយ"
 
-#: ../../src/client/views/conversation-viewer.vala:1203
-msgid " (Invalid?)"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "កត់​ផ្កាយ"
 
-#: ../../src/client/composer/composer-window.vala:972
-#, c-format
-msgid "\"%s\" already attached for delivery."
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:937
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "អ៊ីមែល​ទាំង​អស់"
 
-#: ../../src/client/composer/composer-window.vala:965
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "សារ​ឥត​បាន​ការ"
 
-#: ../../src/client/composer/composer-window.vala:944
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "សំរាម"
 
-#: ../../src/client/composer/composer-window.vala:951
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "ប្រអប់​ចេញ"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
 msgstr ""
 
-#. / 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 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 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"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "គ្មាន​សោះ"
 
-#. / 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 នៅ​ម៉ោង %-l:%M %p"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr ""
 
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] ""
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d សារ​ថ្មី"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:43
-#, c-format
-msgid "%d results"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
 msgstr ""
 
-#. / 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] ""
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "ទៀត"
 
-#: ../../src/client/util/util-date.vala:170
-#, c-format
-msgid "%dh ago"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
 msgstr ""
 
-#: ../../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
 msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:222
-#, c-format
-msgid "%i matches"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
 msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:224
-#, c-format
-msgid "%i matches (wrapped)"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
 msgstr ""
 
-#. / 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 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"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:107
-#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr ""
 
-#. / 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)"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
 msgstr ""
 
-#: ../../src/client/views/conversation-web-view.vala:289
-#, c-format
-msgid "%s - Conversation Inspector"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
 msgstr ""
 
-#: ../../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(គ្មាន​ប្រធានបទ)"
+
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %-e %b, %Y នៅ​ម៉ោង %-l:%M %p"
+
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
 msgstr ""
 
 #. / 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
+#: ../src/engine/rfc822/rfc822-utils.vala:228
 msgid "%s wrote:"
 msgstr "%s បាន​សរសេរ​ថា ៖"
 
-#: ../../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] ""
-
-#. / 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"
+#. / 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:234
+msgid "On %s:"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:246
-#, c-format
-msgid "%u conversations selected."
-msgstr "បាន​ជ្រើស​ការ​សន្ទនា %u"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- សារ​ដែល​បាន​បញ្ជូន​បន្ត ----------"
 
-#: ../../src/client/views/conversation-viewer.vala:743
-#, c-format
-msgid "%u read messages"
-msgstr ""
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "មក​ពី ៖ %s\n"
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr ""
 
-#: ../../src/client/util/util-email.vala:30
-msgid "(no subject)"
-msgstr "(គ្មាន​ប្រធានបទ)"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "កាលបរិច្ឆេទ ៖ %s\n"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- សារ​ដែល​បាន​បញ្ជូន​បន្ត ----------"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "ផ្ញើ​ទៅ ៖ %s\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:211
-msgid "1 month back"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:214
-msgid "1 year back"
-msgstr ""
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "គ្មាន"
 
-#: ../../src/client/accounts/add-edit-page.vala:210
-msgid "2 weeks back"
-msgstr ""
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "កម្ម​វិធី​ផ្ញើ​អ៊ីមែល"
 
-#: ../../src/client/accounts/add-edit-page.vala:212
-msgid "3 months back"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:213
-msgid "6 months back"
-msgstr ""
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "ទៅ​ទស្សនា​តំបន់​បណ្ដាញ​របស់ Yorba"
 
-#: ../../ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
 msgstr ""
 
-#: ../../ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#: ../src/client/application/geary-controller.vala:62
+msgid "Delete conversation (Shift+Delete)"
 msgstr ""
 
-#: ../../ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/application/geary-controller.vala:63
+msgid "Delete conversations (Shift+Delete)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1491
-#, c-format
-msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr "ឯកសារ​មួយ​ ឈ្មោះ​ថា \\\"%s\\\" មាន​នៅ​ហើយ ។ តើ​អ្នក​ចង់​ជំនួស​វា​ឬ​ទេ ?"
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:245
-msgid "A_ccounts"
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1227
-#, c-format
-msgid "About %s"
-msgstr "អំពី %s"
+#: ../src/client/application/geary-controller.vala:72
+msgid "_Archive"
+msgstr "_ទុក​ក្នុង​ប័ណ្ណសារ"
 
-#: ../../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
+#: ../src/client/application/geary-controller.vala:73
+msgid "Archive conversation (A)"
 msgstr ""
 
-#: ../../ui/account_list.glade:71
-msgid "Add account"
+#: ../src/client/application/geary-controller.vala:74
+msgid "Archive conversations (A)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:304
-msgid "Add label"
+#: ../src/client/application/geary-controller.vala:77
+msgid "Mark as S_pam"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:57
-msgid "Add label to conversation"
+#: ../src/client/application/geary-controller.vala:78
+msgid "Mark as not S_pam"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:58
-msgid "Add label to conversations"
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
+msgid "Mark conversation"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "អ៊ីមែល​ទាំង​អស់"
-
-#: ../../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."
+#: ../src/client/application/geary-controller.vala:81
+msgid "Mark conversations"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:24
-msgid "Allow inspection of WebView"
+#: ../src/client/application/geary-controller.vala:82
+msgid "Add label to conversation"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:509
-msgid "Always Show From Sender"
+#: ../src/client/application/geary-controller.vala:83
+msgid "Add label to conversations"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
+msgid "Move conversation"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:48
-msgid "Archive conversation (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:85
+msgid "Move conversations"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:49
-msgid "Archive conversations (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:372
+msgid "A_ccounts"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1477
-#, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr "តើ​អ្នក​ប្រាកដ​ថា​ចង់​បើក \"%s\" ?"
+#: ../src/client/application/geary-controller.vala:377
+#: ../src/client/components/stock.vala:27
+msgid "_Preferences"
+msgstr "_ចំណង់​ចំណូល​ចិត្ត"
 
-#: ../../src/client/geary-controller.vala:1478
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
-msgstr ""
-"ឯកសារ​ភ្ជាប់​អាច​បង្ខូច​ប្រព័ន្ធ​អ្នក​បាន បើ​សិន​ជា​អ្នក​បើក​វា​ឡើង ចូរ​បើក​តែ​ឯកសារ​ដែល​មាន​ប្រភព​ 
ដែលអ្នក​ទុក​"
-"ចិត្ត​​បុណ្ណោះ ។"
+#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/components/stock.vala:25
+msgid "_Help"
+msgstr "_ជំនួយ"
 
-#: ../../src/client/views/conversation-viewer.vala:614
-msgid "Bcc:"
-msgstr "លាក់ ៖"
+#: ../src/client/application/geary-controller.vala:385
+#: ../src/client/components/stock.vala:21
+msgid "_About"
+msgstr "_អំពី"
 
-#: ../../ui/composer.glade:113
-msgid "Bold (Ctrl+B)"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:389
+#: ../src/client/components/stock.vala:29
+msgid "_Quit"
+msgstr "_បោះ​បង់"
+
+#: ../src/client/application/geary-controller.vala:394
+msgid "_Mark as..."
+msgstr "_សម្គាល់​ជា..."
 
-#: ../../ui/composer.glade:69
-msgid "C_olor"
+#: ../src/client/application/geary-controller.vala:400
+msgid "Mark as _Read"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:926
-msgid "Cannot add attachment"
-msgstr "មិន​អាច​បន្ថែម​ឯកសារ​ភ្ជាប់​បាន​ទេ"
+#: ../src/client/application/geary-controller.vala:406
+msgid "Mark as _Unread"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:611
-msgid "Cc:"
-msgstr "ចម្លង ៖"
+#: ../src/client/application/geary-controller.vala:412
+msgid "_Star"
+msgstr "_ដាក់​ផ្កាយ"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
+#: ../src/client/application/geary-controller.vala:417
+msgid "U_nstar"
 msgstr ""
 
-#: ../../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "សូម​ជ្រើស​រើស​ឯកសារ​មួយ"
-
-#: ../../src/client/geary-controller.vala:553
-msgid "Co_ntinue"
+#: ../src/client/application/geary-controller.vala:427
+msgid "Add label"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:29
-msgid "Compose Message"
-msgstr "តែង​សារ"
+#: ../src/client/application/geary-controller.vala:428
+msgid "_Label"
+msgstr "_ដាក់​ស្លាក"
 
-#: ../../src/client/geary-controller.vala:313
-msgid "Compose new message (Ctrl+N, N)"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:432
+msgid "_Move"
+msgstr "_ផ្លាស់​ទី"
 
-#: ../../ui/preferences.glade:117
-msgid "Composer"
+#: ../src/client/application/geary-controller.vala:436
+msgid "Compose new message (Ctrl+N, N)"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:897
-msgid "Copy _Email Address"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
+msgid "_Reply"
+msgstr "_ឆ្លើយ​តប"
 
-#: ../../src/client/views/conversation-viewer.vala:902
-msgid "Copy _Link"
+#: ../src/client/application/geary-controller.vala:441
+msgid "Reply (Ctrl+R, R)"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
+#: ../src/client/application/geary-controller.vala:445
+msgid "R_eply All"
 msgstr ""
 
-#: ../../ui/composer.glade:21
-msgid "Cu_t"
+#: ../src/client/application/geary-controller.vala:446
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:620
-msgid "Date:"
-msgstr "កាលបរិច្ឆេទ ៖"
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
+msgid "_Forward"
+msgstr "_បញ្ចូន​បន្ត"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "កាលបរិច្ឆេទ ៖ %s\n"
+#: ../src/client/application/geary-controller.vala:452
+msgid "Forward (Ctrl+L, F)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:43
-msgid "Delete conversation (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:44
-msgid "Delete conversations (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:25
-msgid "Display program version"
-msgstr "បង្ហាញ​កំណែ​កម្ម​វិធី"
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:663
-msgid "Do you want to discard the unsaved message?"
-msgstr "តើ​អ្នក​ចង់​ចោល​សារ​ដែល​មិន​ទាន់​រក្សា​ទុក​ឬទេ ?"
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:666
-msgid "Do you want to discard this message?"
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1479
-msgid "Don't _ask me again"
+#: ../src/client/application/geary-controller.vala:746
+msgid "Unable to store server trust exception"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "សេចក្ដី​ព្រាង"
+#: ../src/client/application/geary-controller.vala:983
+msgid "Your settings are insecure"
+msgstr "ការ​កំណត់​របស់​អ្នក​គ្មាន​សុវត្ថិភាព​ទេ"
 
-#: ../../ui/composer.glade:419
-msgid "Drop files here"
-msgstr "ជម្រុះ​ឯកសារ​នៅ​ទី​នេះ"
+#: ../src/client/application/geary-controller.vala:984
+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 ""
+"ការ​កំណត់​របស់​អ្នក​សំរាប់ IMAP និង/ឬ SMTP មិន​បញ្ជាក់​លម្អិត SSL ឬ TLS ទេ ។ "
+"នេះ​មាន​ន័យ​ថា អ្នក​ដទៃ​នៅ​ក្នុង​បណ្ដាញ​នេះ​អាច​អាន​ ឈ្មោះ​អ្នក​ប្រើ "
+"និង​ពាក្យ​សម្ងាត់ របស់​អ្នក​បាន តើ​អ្នក​ប្រាកដ​ថា ចង់​ធ្វើ​នេះ​ឬ​ទេ ?"
 
-#: ../../ui/login.glade:115
-msgid "E_mail address:"
+#: ../src/client/application/geary-controller.vala:985
+msgid "Co_ntinue"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:704
-msgid "E_xit"
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/components/status-bar.vala:29
+msgid "Error sending email"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:533
-msgid "Edit Draft"
+#: ../src/client/application/geary-controller.vala:1064
+msgid ""
+"Geary encountered an error sending an email.  If the problem persists, "
+"please manually delete the email from your Outbox folder."
 msgstr ""
 
-#: ../../ui/account_list.glade:84
-msgid "Edit account"
+#: ../src/client/application/geary-controller.vala:1068
+#: ../src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
 msgstr ""
 
-#: ../../ui/remove_confirm.glade:94
-msgid "Email address:"
+#: ../src/client/application/geary-controller.vala:1069
+msgid ""
+"Geary encountered an error saving a sent message to Sent Mail.  The message "
+"will stay in your Outbox folder until you delete it."
 msgstr ""
 
-#: ../../src/client/geary-application.vala:28
-msgid "Email;E-mail;Mail;"
+#: ../src/client/application/geary-controller.vala:1138
+msgid "Labels"
+msgstr "ស្លាក"
+
+#: ../src/client/application/geary-controller.vala:1150
+msgid "Unable to open the database for %s"
 msgstr ""
 
-#: ../../ui/preferences.glade:131
-msgid "Enable _spell checking"
+#: ../src/client/application/geary-controller.vala:1151
+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 ""
 
-#: ../../ui/login.glade:588
-msgid "Encr_yption:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "_Rebuild"
 msgstr ""
 
-#: ../../ui/login.glade:607
-msgid "Encrypt_ion:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "E_xit"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-msgid "Enter your account information to get started."
-msgstr "សូម​បញ្ចូល​ពត៌មាន​របស់​គណនី​អ្នក​ដើម្បី​ចាប់​ផ្ដើម ។"
+#: ../src/client/application/geary-controller.vala:1162
+msgid "Unable to rebuild database for \"%s\""
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:714
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:43
-msgid "Error saving"
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
+msgid "Unable to open local mailbox for %s"
 msgstr ""
 
-#. / 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"
+#: ../src/client/application/geary-controller.vala:1186
+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 ""
 
-#: ../../src/client/accounts/add-edit-page.vala:216
-msgid "Everything"
+#: ../src/client/application/geary-controller.vala:1196
+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 ""
 
-#: ../../src/client/views/conversation-viewer.vala:1897
-msgid "Failed to open default text editor."
-msgstr "បរាជ័យ​បើក​កម្ម​វិធី​និពន្ធ​អត្ថបទ​ដ៏​លំនាំ​ដើម ។"
-
-#: ../../src/client/geary-args.vala:54
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "បរាជ័យ​ញែក​ជម្រើស​របស់​បន្ទាត់​ពាក្យ​បញ្ជា ៖ %s\n"
-
-#. / 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"
+#: ../src/client/application/geary-controller.vala:1207
+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 ""
 
-#: ../../ui/composer.glade:182
-msgid "Fixed Width"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:1715
+msgid "About %s"
+msgstr "អំពី %s"
 
-#: ../../src/client/geary-controller.vala:329
-msgid "Forward (Ctrl+L, F)"
+#. / 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-controller.vala:1718
+msgid "translator-credits"
 msgstr ""
+"ទទួល​ស្គាល់​អ្នក​បក​ប្រែ\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Jim Nelson https://launchpad.net/~yorba-jim";
 
-#: ../../src/client/views/conversation-viewer.vala:605
-msgid "From:"
-msgstr "មក​ពី ៖"
-
-#: ../../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "មក​ពី ៖ %s\n"
-
-#: ../../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "ជីកាបៃ"
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/geary-application.vala:25
-msgid "Geary Mail"
-msgstr "Geary Mail"
+#: ../src/client/application/geary-controller.vala:1986
+msgid "Are you sure you want to open \"%s\"?"
+msgstr "តើ​អ្នក​ប្រាកដ​ថា​ចង់​បើក \"%s\" ?"
 
-#: ../../src/client/geary-controller.vala:626
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
 msgstr ""
+"ឯកសារ​ភ្ជាប់​អាច​បង្ខូច​ប្រព័ន្ធ​អ្នក​បាន "
+"បើ​សិន​ជា​អ្នក​បើក​វា​ឡើង ចូរ​បើក​តែ​ឯកសារ​ដែល​មាន​ប្រភព​ "
+"ដែលអ្នក​ទុក​ចិត្ត​​បុណ្ណោះ ។"
 
-#: ../../ui/password-dialog.glade:315
-msgid "General"
+#: ../src/client/application/geary-controller.vala:1988
+msgid "Don't _ask me again"
 msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
-
-#: ../../ui/password-dialog.glade:133
-msgid "IMAP Credentials"
-msgstr "លិខិត​តែង​តាំង IMAP"
+#: ../src/client/application/geary-controller.vala:2006
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+"ឯកសារ​មួយ​ ឈ្មោះ​ថា \\\"%s\\\" មាន​នៅ​ហើយ ។ តើ​អ្នក​ចង់​ជំនួស​វា​ឬ​ទេ ?"
 
-#: ../../ui/login.glade:572
-msgid "IMAP password"
+#: ../src/client/application/geary-controller.vala:2008
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
+"ឯកសារ​នេះ​មាន​នៅ​ហើយ​ក្នុង \"%s\" ។ បើ​សិន​ជំនួស​វា "
+"នោះ​នឹង​សរសេរ​ជាន់​លើ​មាតិកា​របស់​វា ។"
 
-#: ../../ui/login.glade:286 ../../ui/password-dialog.glade:334
-msgid "IMAP settings"
-msgstr "ការ​កំណត់ IMAP"
+#: ../src/client/application/geary-controller.vala:2011
+msgid "_Replace"
+msgstr "_ជំនួស"
 
-#: ../../ui/login.glade:556
-msgid "IMAP username"
+#: ../src/client/application/geary-controller.vala:2309
+msgid "Close open draft messages?"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "ប្រអប់​ទទួល"
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
 
-#: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
 msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:163
-#, c-format
-msgid "Indexing %s account"
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
 msgstr ""
 
-#: ../../ui/composer.glade:120
-msgid "Italic (Ctrl+I)"
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
 msgstr ""
 
-#: ../../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "គីឡូបៃ"
+#: ../src/client/application/geary-controller.vala:2489
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/geary-controller.vala:689
-msgid "Labels"
-msgstr "ស្លាក"
+#: ../src/client/application/geary-controller.vala:2491
+msgid "Delete"
+msgstr ""
 
-#: ../../ui/composer.glade:151
-msgid "Lar_ge"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
 msgstr ""
 
-#: ../../ui/composer.glade:152
-msgid "Large"
-msgstr "ធំ"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
+msgstr ""
 
-#: ../../ui/composer.glade:62
-msgid "Link (Ctrl+L)"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
 msgstr ""
 
-#. / 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 "ចុះ​កំណត់​ហេតុ​របស់​ជួរ IMAP replay"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr ""
+
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "ចេញ​ពត៌មាន​ពី​ការ​បំបាត់​កំហុស"
 
-#: ../../src/client/geary-args.vala:11
+#: ../src/client/application/geary-args.vala:12
 msgid "Log conversation monitoring"
 msgstr "ចុះ​កំណត់​ហេតុ​ការ​ត្រួត​ពិនិត្យ​របស់​ការ​សន្ទនា"
 
-#: ../../src/client/geary-args.vala:21
-msgid "Log database queries (generates lots of messages)"
-msgstr "ចុះ​កំណត់​ហេតុ​សំនួរ​របស់​មូលដ្ឋាន​ទិន្នន័យ (បង្កើត​សារ​ជា​ច្រើន)"
-
-#. / "Normalization" can also be called "synchronization"
-#: ../../src/client/geary-args.vala:23
-msgid "Log folder normalization"
-msgstr "ចុះ​កំណត់​ហេតុ​ការ​ធ្វើ​ឲ្យ​ថត​ទៅ​ជា​ធម្មតា"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:13
+#: ../src/client/application/geary-args.vala:14
 msgid "Log network activity"
 msgstr "ចុះ​កំណត់​ហេតុ​សកម្មភាព​របស់​បណ្ដាញ"
 
-#: ../../src/client/geary-args.vala:12
-msgid "Log network deserialization"
-msgstr ""
+#. / 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 "ចុះ​កំណត់​ហេតុ​របស់​ជួរ IMAP replay"
 
 #. / Serialization is how commands and responses are converted into a stream of bytes for
 #. / network transmission
-#: ../../src/client/geary-args.vala:19
+#: ../src/client/application/geary-args.vala:20
 msgid "Log network serialization"
 msgstr "ចុះ​កំណត់​ហេតុ​ការ​សៀរៀល​របស់​បណ្ដាញ"
 
-#: ../../src/client/geary-args.vala:20
+#: ../src/client/application/geary-args.vala:21
 msgid "Log periodic activity"
 msgstr "ចុះ​កំណត់​ហេតុ​សកម្មភាព​តាម​ពេល​កំណត់"
 
-#: ../../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "មេកាបៃ"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "ចុះ​កំណត់​ហេតុ​សំនួរ​របស់​មូលដ្ឋាន​ទិន្នន័យ (បង្កើត​សារ​ជា​ច្រើន)"
 
-#: ../../src/client/geary-application.vala:26
-msgid "Mail Client"
-msgstr "កម្ម​វិធី​ផ្ញើ​អ៊ីមែល"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "ចុះ​កំណត់​ហេតុ​ការ​ធ្វើ​ឲ្យ​ថត​ទៅ​ជា​ធម្មតា"
 
-#: ../../src/client/views/conversation-viewer.vala:1479
-msgid "Mark Unread From _Here"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:52
-msgid "Mark as S_pam"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:277
-msgid "Mark as _Read"
-msgstr ""
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "បង្ហាញ​កំណែ​កម្ម​វិធី"
 
-#: ../../src/client/geary-controller.vala:283
-msgid "Mark as _Unread"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:53
-msgid "Mark as not S_pam"
-msgstr ""
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "សូម​របាយការណ៍​យោបល់ សំណូម ហើយ​និង​កំហុស ដល់ ៖"
 
-#: ../../src/client/geary-controller.vala:55
-#: ../../src/client/geary-controller.vala:269
-msgid "Mark conversation"
-msgstr ""
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "បរាជ័យ​ញែក​ជម្រើស​របស់​បន្ទាត់​ពាក្យ​បញ្ជា ៖ %s\n"
 
-#: ../../src/client/geary-controller.vala:56
-msgid "Mark conversations"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "មិន​ស្គាល់​ជម្រើស​ក្នុង​បន្ទាត់​ពាក្យ​បញ្ជា \"%s\"\n"
+
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
 msgstr ""
 
-#: ../../src/client/views/formatted-conversation-data.vala:11
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d សារ​ថ្មី"
+
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "បើក"
+
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "ខ្ញុំ"
 
-#: ../../ui/composer.glade:158
-msgid "Medium"
-msgstr "មធ្យម"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr ""
 
-#: ../../ui/composer.glade:75
-msgid "More options"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:59
-#: ../../src/client/geary-controller.vala:308
-msgid "Move conversation"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:60
-msgid "Move conversations"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
 msgstr ""
 
-#: ../../ui/login.glade:176
-msgid "N_ame:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
 msgstr ""
 
-#: ../../ui/login.glade:230
-msgid "N_ickname:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "សារ​ថ្មី"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:80
-msgid "Nickname:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
 msgstr ""
 
-#: ../../ui/login.glade:661
-msgid "No authentication re_quired"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:275
-msgid "No conversations in folder."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:244
-msgid "No conversations selected."
-msgstr "គ្មាន​ជ្រើស​ការ​សន្ទនា"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:273
-msgid "No search results found."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:128
-#: ../../src/engine/api/geary-special-folder-type.vala:58
-msgid "None"
-msgstr "គ្មាន​សោះ"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr ""
 
-#: ../../ui/preferences.glade:158
-msgid "Notifications"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
 msgstr ""
 
-#: ../../src/client/util/util-date.vala:164
-msgid "Now"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
 msgstr ""
 
-#. / 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:"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
 msgstr ""
 
-#. / 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:"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "សូម​ជ្រើស​រើស​ឯកសារ​មួយ"
+
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_ភ្ជាប់"
+
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
 msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "បើក"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "ទៀត"
+#. / 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 ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "ប្រអប់​ចេញ"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "សូម​ស្វាគមន៍ Geary"
 
-#: ../../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "សូម​បញ្ចូល​ពត៌មាន​របស់​គណនី​អ្នក​ដើម្បី​ចាប់​ផ្ដើម ។"
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:10
-msgid "Output debugging information"
-msgstr "ចេញ​ពត៌មាន​ពី​ការ​បំបាត់​កំហុស"
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr ""
 
-#: ../../ui/login.glade:337
-msgid "P_ort:"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
 msgstr ""
 
-#: ../../ui/login.glade:474
-msgid "Pass_word:"
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
 msgstr ""
 
-#: ../../ui/login.glade:101
-msgid "Password"
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:196
-msgid "Password:"
-msgstr "ពាក្យ​សម្ងាត់ ៖"
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr ""
 
-#: ../../ui/composer.glade:102
-msgid "Paste _With Formatting"
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your email password"
-msgstr "សូម​បញ្ចូល​ពាក្យ​សម្ងាត់​អ៊ីមែល​របស់​អ្នក"
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:47
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "សូម​របាយការណ៍​យោបល់ សំណូម ហើយ​និង​កំហុស ដល់ ៖"
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
 
-#: ../../ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
 msgstr ""
 
-#: ../../ui/login.glade:421
-msgid "Por_t:"
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:367 ../../ui/password-dialog.glade:470
-msgid "Port:"
-msgstr "ច្រក ៖"
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr ""
 
-#: ../../ui/composer.glade:81
-msgid "Quote text  (Ctrl+])"
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:322
-msgid "R_eply All"
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
 msgstr ""
 
-#: ../../ui/preferences.glade:55
-msgid "Reading"
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:274
-msgid "Real name:"
-msgstr "ឈ្មោះ​ពិត ៖"
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:590
-msgid "Remem_ber password"
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:583
-msgid "Remem_ber passwords"
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
 msgstr ""
 
-#: ../../ui/account_list.glade:97
-msgid "Remove account"
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
 msgstr ""
 
-#: ../../ui/composer.glade:95
-msgid "Remove formatting (Ctrl+Space)"
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:318
-msgid "Reply (Ctrl+R, R)"
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:323
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1452
-msgid "Reply to _All"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:163
-msgid "SMTP Credentials"
-msgstr "លិខិត​តែង​តាំង SMTP"
+#. / 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 "%l:%M %P"
+
+#. / 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"
 
-#: ../../ui/login.glade:507
-msgid "SMTP password"
+#. / 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 %-l:%M  %P"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
 msgstr ""
 
-#: ../../ui/login.glade:439 ../../ui/password-dialog.glade:437
-msgid "SMTP settings"
-msgstr "ការ​កំណត់ SMTP"
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:491
-msgid "SMTP username"
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:124
-msgid "SSL"
+#. / 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
+msgid "%A"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:382 ../../ui/password-dialog.glade:485
-msgid "SSL/TLS encryption:"
-msgstr "អ៊ិនគ្រីប SSL/TLS ៖"
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "បៃ"
 
-#: ../../src/client/dialogs/password-dialog.vala:126
-msgid "STARTTLS"
-msgstr ""
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "តេរ៉ាបៃ"
+
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "ជីកាបៃ"
+
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "មេកាបៃ"
+
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "គីឡូបៃ"
+
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:169
-msgid "S_ans Serif"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] ""
+msgstr[1] ""
+
+#. / 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
+msgid "%s, %s"
 msgstr ""
 
-#: ../../ui/composer.glade:175
-msgid "S_erif"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
 msgstr ""
 
-#: ../../ui/login.glade:160
-msgid "S_ervice:"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
 msgstr ""
 
-#: ../../ui/composer.glade:170
-msgid "Sans Serif"
-msgstr "Sans Serif"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/views/conversation-viewer.vala:1437
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "គ្មាន​ជ្រើស​ការ​សន្ទនា"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
 msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/views/conversation-viewer.vala:1400
-msgid "Save All A_ttachments..."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:41
-msgid "Saved"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:42
-msgid "Saving"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
 msgstr ""
 
-#: ../../ui/login.glade:304
-msgid "Se_rver:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
 msgstr ""
 
-#: ../../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"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
 msgstr ""
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:39
-#: ../../src/client/ui/main-toolbar.vala:170
-#, c-format
-msgid "Search %s account"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
 msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:76
-msgid "Search all mail in account for keywords (Ctrl+S)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "មក​ពី ៖"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "ផ្ញើ​ទៅ ៖"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "ចម្លង ៖"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "លាក់ ៖"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "ប្រធាន​បទ ៖"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "កាលបរិច្ឆេទ ៖"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:1243
-msgid "Select Color"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "_ចម្លង"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:32
-#: ../../src/client/views/conversation-viewer.vala:916
-msgid "Select _All"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:910
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:27
-msgid "Send and receive email"
-msgstr "ផ្ញើ​និង​ទទួល​អ៊ីមែល"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:747
-msgid "Send message with an empty body?"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:743
-msgid "Send message with an empty subject and body?"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:745
-msgid "Send message with an empty subject?"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:749
-msgid "Send message without an attachment?"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
 msgstr ""
 
-#. / 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..."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "អ៊ីមែលផ្ញើ​ហើយ"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_រក្សាទុក​ជា"
 
-#: ../../ui/login.glade:404
-msgid "Ser_ver:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
 msgstr ""
 
-#: ../../ui/composer.glade:176
-msgid "Serif"
-msgstr "Serif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/password-dialog.glade:352 ../../ui/password-dialog.glade:455
-msgid "Server:"
-msgstr "ម៉ាស៊ីន​បម្រើ ៖"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:259
-msgid "Service:"
-msgstr "សេវាកម្ម ៖"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "_សម្គាល់​ជា​បាន​អាន​ហើយ"
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "Show Images"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "_សម្គាល់​ជា​មិន​ទាន់​អាន"
 
-#: ../../ui/preferences.glade:193
-msgid "Show _notifications for new mail"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
 msgstr ""
 
-#: ../../ui/composer.glade:164
-msgid "Small"
-msgstr "តូច"
-
-#: ../../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "សារ​ឥត​បាន​ការ"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "_មើល​ប្រភព"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "កត់​ផ្កាយ"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "បរាជ័យ​បើក​កម្ម​វិធី​និពន្ធ​អត្ថបទ​ដ៏​លំនាំ​ដើម ។"
 
-#: ../../ui/login.glade:761
-msgid "Storage"
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
 msgstr ""
 
-#: ../../ui/composer.glade:134
-msgid "Strikethrough (Ctrl+K)"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:617
-msgid "Subject:"
-msgstr "ប្រធាន​បទ ៖"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
 msgstr ""
 
-#: ../../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "តេរ៉ាបៃ"
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:1493
-#, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr "ឯកសារ​នេះ​មាន​នៅ​ហើយ​ក្នុង \"%s\" ។ បើ​សិន​ជំនួស​វា នោះ​នឹង​សរសេរ​ជាន់​លើ​មាតិកា​របស់​វា ។"
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "សារ​ថ្មី"
 
-#: ../../src/client/geary-controller.vala:747
+#: ../src/client/composer/composer-widget.vala:138
 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."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
 
-#: ../../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."
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
 msgstr ""
 
-#: ../../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"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
 msgstr ""
 
-#: ../../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>"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1147
-msgid "This link appears to go to"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "This message contains remote images."
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
 msgstr ""
 
-#: ../../ui/composer.glade:435
-msgid "To add them as attachments"
-msgstr "ដើម្បី​បន្ថែម​ជា​ឯកសារ​ភ្ជាប់"
-
-#: ../../src/client/views/conversation-viewer.vala:608
-msgid "To:"
-msgstr "ផ្ញើ​ទៅ ៖"
-
-#: ../../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "ផ្ញើ​ទៅ ៖ %s\n"
-
-#: ../../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "សំរាម"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "មិន​អាច​បន្ថែម​ឯកសារ​ភ្ជាប់​បាន​ទេ"
 
-#: ../../src/client/geary-controller.vala:294
-msgid "U_nstar"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:17
-msgid "Unable to login to email server"
-msgstr "មិន​អាច​ចូល​ម៉ាស៊ីន​បម្រើ​សំបុត្រ​បាន​ទេ"
-
-#: ../../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"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:701
-#, c-format
-msgid "Unable to open the database for %s"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:713
-#, c-format
-msgid "Unable to rebuild database for \"%s\""
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:619
-msgid "Unable to validate:\n"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
 msgstr ""
 
-#: ../../ui/composer.glade:127
-msgid "Underline (Ctrl+U)"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
 msgstr ""
 
-#: ../../ui/composer.glade:88
-msgid "Unquote text (Ctrl+[)"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
 msgstr ""
 
-#: ../../src/client/geary-args.vala:65
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "មិន​ស្គាល់​ជម្រើស​ក្នុង​បន្ទាត់​ពាក្យ​បញ្ជា \"%s\"\n"
-
-#: ../../ui/login.glade:457
-msgid "User_name:"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
 msgstr ""
 
-#: ../../ui/password-dialog.glade:70 ../../ui/password-dialog.glade:181
-msgid "Username:"
-msgstr "ឈ្មោះ​អ្នក​ប្រើ ៖"
-
-#: ../../src/client/geary-application.vala:19
-msgid "Visit the Yorba web site"
-msgstr "ទៅ​ទស្សនា​តំបន់​បណ្ដាញ​របស់ Yorba"
-
-#: ../../src/client/accounts/add-edit-page.vala:190
-#, c-format
-msgid "Welcome to Geary."
-msgstr "សូម​ស្វាគមន៍ Geary"
-
-#: ../../ui/login.glade:252
-msgid "Work, Home, etc."
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
 msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr ""
 
-#: ../../src/client/util/util-date.vala:177
-msgid "Yesterday"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
 msgstr ""
 
-#: ../../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?"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
 msgstr ""
-"ការ​កំណត់​របស់​អ្នក​សំរាប់ IMAP និង/ឬ SMTP មិន​បញ្ជាក់​លម្អិត SSL ឬ TLS ទេ ។ នេះ​មាន​ន័យ​ថា អ្នក​ដទៃ​"
-"នៅ​ក្នុង​បណ្ដាញ​នេះ​អាច​អាន​ ឈ្មោះ​អ្នក​ប្រើ និង​ពាក្យ​សម្ងាត់ របស់​អ្នក​បាន តើ​អ្នក​ប្រាកដ​ថា 
ចង់​ធ្វើ​នេះ​ឬ​"
-"ទេ ?"
 
-#: ../../src/client/geary-controller.vala:551
-msgid "Your settings are insecure"
-msgstr "ការ​កំណត់​របស់​អ្នក​គ្មាន​សុវត្ថិភាព​ទេ"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:258
-#: ../../src/client/ui/stock.vala:21
-msgid "_About"
-msgstr "_អំពី"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr ""
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:22
-msgid "_Add"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:47
-msgid "_Archive"
-msgstr "_ទុក​ក្នុង​ប័ណ្ណសារ"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_ភ្ជាប់"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:525
-msgid "_Attach File"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
 msgstr ""
 
-#: ../../ui/preferences.glade:69
-msgid "_Automatically select next message"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:19
+#: ../src/client/components/stock.vala:19
 msgid "_Cancel"
 msgstr "_បោះ​បង់"
 
-#: ../../ui/composer.glade:52
-msgid "_Center"
-msgstr "_កណ្ដាល"
-
-#: ../../src/client/ui/stock.vala:23
+#: ../src/client/components/stock.vala:23
 msgid "_Close"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:889
-msgid "_Copy"
-msgstr "_ចម្លង"
-
-#: ../../src/client/geary-controller.vala:42
-msgid "_Delete"
-msgstr "_លុប"
-
-#: ../../ui/password-dialog.glade:548
-msgid "_Details"
-msgstr "_លម្អិត"
-
-#: ../../src/client/ui/stock.vala:24
+#: ../src/client/components/stock.vala:24
 msgid "_Discard"
 msgstr ""
 
-#: ../../ui/preferences.glade:90
-msgid "_Display conversation preview"
-msgstr ""
-
-#: ../../src/client/geary-controller.vala:262
-msgid "_Donate"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
 msgstr ""
 
-#: ../../ui/login.glade:782
-msgid "_Download mail:"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
 msgstr ""
 
-#: ../../ui/composer.glade:181
-msgid "_Fixed Width"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:328
-#: ../../src/client/views/conversation-viewer.vala:1457
-msgid "_Forward"
-msgstr "_បញ្ចូន​បន្ត"
-
-#: ../../src/client/geary-controller.vala:254
-#: ../../src/client/ui/stock.vala:25
-msgid "_Help"
-msgstr "_ជំនួយ"
-
-#: ../../ui/composer.glade:542
-msgid "_Include Original Attachments"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:922
-msgid "_Inspect"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
 msgstr ""
 
-#: ../../ui/composer.glade:57
-msgid "_Justify"
-msgstr "_ត្រឹម​សង​ខាង"
-
-#: ../../src/client/ui/stock.vala:33
-msgid "_Keep"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:305
-msgid "_Label"
-msgstr "_ដាក់​ស្លាក"
-
-#: ../../ui/composer.glade:42
-msgid "_Left"
-msgstr "_ឆ្វេង"
-
-#: ../../src/client/views/conversation-viewer.vala:1469
-msgid "_Mark as Read"
-msgstr "_សម្គាល់​ជា​បាន​អាន​ហើយ"
-
-#: ../../src/client/views/conversation-viewer.vala:1473
-msgid "_Mark as Unread"
-msgstr "_សម្គាល់​ជា​មិន​ទាន់​អាន"
+#~ msgid "%u conversations selected."
+#~ msgstr "បាន​ជ្រើស​ការ​សន្ទនា %u"
 
-#: ../../src/client/geary-controller.vala:271
-msgid "_Mark as..."
-msgstr "_សម្គាល់​ជា..."
+#~ msgid "Compose Message"
+#~ msgstr "តែង​សារ"
 
-#: ../../ui/composer.glade:157
-msgid "_Medium"
-msgstr ""
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "តើ​អ្នក​ចង់​ចោល​សារ​ដែល​មិន​ទាន់​រក្សា​ទុក​ឬទេ ?"
 
-#: ../../src/client/geary-controller.vala:309
-msgid "_Move"
-msgstr "_ផ្លាស់​ទី"
+#~ msgid "Drop files here"
+#~ msgstr "ជម្រុះ​ឯកសារ​នៅ​ទី​នេះ"
 
-#: ../../src/client/ui/stock.vala:18
-msgid "_OK"
-msgstr ""
+#~ msgid "Geary Mail"
+#~ msgstr "Geary Mail"
 
-#: ../../src/client/ui/stock.vala:26
-msgid "_Open"
-msgstr ""
+#~ msgid "IMAP Credentials"
+#~ msgstr "លិខិត​តែង​តាំង IMAP"
 
-#: ../../ui/login.glade:131 ../../ui/login.glade:539
-#: ../../ui/password-dialog.glade:85
-msgid "_Password:"
-msgstr "_ពាក្យ​សម្ងាត់ ៖"
+#~ msgid "IMAP settings"
+#~ msgstr "ការ​កំណត់ IMAP"
 
-#: ../../ui/composer.glade:35
-msgid "_Paste"
-msgstr ""
+#~ msgid "Large"
+#~ msgstr "ធំ"
 
-#: ../../ui/preferences.glade:172
-msgid "_Play notification sounds"
-msgstr ""
+#~ msgid "Medium"
+#~ msgstr "មធ្យម"
 
-#: ../../src/client/geary-controller.vala:250
-#: ../../src/client/ui/stock.vala:27
-msgid "_Preferences"
-msgstr "_ចំណង់​ចំណូល​ចិត្ត"
+#~ msgid "Password:"
+#~ msgstr "ពាក្យ​សម្ងាត់ ៖"
 
-#: ../../src/client/ui/stock.vala:28
-msgid "_Print..."
-msgstr ""
+#~ msgid "Please enter your email password"
+#~ msgstr "សូម​បញ្ចូល​ពាក្យ​សម្ងាត់​អ៊ីមែល​របស់​អ្នក"
 
-#: ../../src/client/geary-controller.vala:266
-#: ../../src/client/ui/stock.vala:29
-msgid "_Quit"
-msgstr "_បោះ​បង់"
+#~ msgid "Port:"
+#~ msgstr "ច្រក ៖"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "_Rebuild"
-msgstr ""
+#~ msgid "Real name:"
+#~ msgstr "ឈ្មោះ​ពិត ៖"
 
-#: ../../ui/composer.glade:14
-msgid "_Redo"
-msgstr ""
+#~ msgid "SMTP Credentials"
+#~ msgstr "លិខិត​តែង​តាំង SMTP"
 
-#: ../../ui/password-dialog.glade:561
-msgid "_Remember passwords"
-msgstr ""
+#~ msgid "SMTP settings"
+#~ msgstr "ការ​កំណត់ SMTP"
 
-#: ../../src/client/ui/stock.vala:30
-msgid "_Remove"
-msgstr ""
+#~ msgid "SSL/TLS encryption:"
+#~ msgstr "អ៊ិនគ្រីប SSL/TLS ៖"
 
-#: ../../src/client/geary-controller.vala:1496
-msgid "_Replace"
-msgstr "_ជំនួស"
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../../src/client/geary-controller.vala:317
-#: ../../src/client/views/conversation-viewer.vala:1447
-msgid "_Reply"
-msgstr "_ឆ្លើយ​តប"
+#~ msgid "Send and receive email"
+#~ msgstr "ផ្ញើ​និង​ទទួល​អ៊ីមែល"
 
-#: ../../ui/composer.glade:141
-msgid "_Rich Text"
-msgstr ""
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../../ui/composer.glade:47
-msgid "_Right"
-msgstr "_ស្ដាំ"
+#~ msgid "Server:"
+#~ msgstr "ម៉ាស៊ីន​បម្រើ ៖"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:31
-msgid "_Save"
-msgstr ""
-
-#: ../../src/client/views/conversation-viewer.vala:1395
-msgid "_Save As..."
-msgstr "_រក្សាទុក​ជា"
+#~ msgid "Service:"
+#~ msgstr "សេវាកម្ម ៖"
 
-#: ../../src/client/views/conversation-viewer.vala:1414
-msgid "_Save Image As..."
-msgstr ""
+#~ msgid "Small"
+#~ msgstr "តូច"
 
-#: ../../ui/composer.glade:594
-msgid "_Send"
-msgstr "_ផ្ញើ​ទៅ"
+#~ msgid "To add them as attachments"
+#~ msgstr "ដើម្បី​បន្ថែម​ជា​ឯកសារ​ភ្ជាប់"
 
-#: ../../ui/composer.glade:163
-msgid "_Small"
-msgstr ""
+#~ msgid "Unable to login to email server"
+#~ msgstr "មិន​អាច​ចូល​ម៉ាស៊ីន​បម្រើ​សំបុត្រ​បាន​ទេ"
 
-#: ../../src/client/geary-controller.vala:289
-msgid "_Star"
-msgstr "_ដាក់​ផ្កាយ"
+#~ msgid "Username:"
+#~ msgstr "ឈ្មោះ​អ្នក​ប្រើ ៖"
 
-#: ../../ui/composer.glade:7
-msgid "_Undo"
-msgstr ""
+#~ msgid "_Center"
+#~ msgstr "_កណ្ដាល"
 
-#: ../../ui/login.glade:522
-msgid "_Username:"
-msgstr "_ឈ្មោះ​អ្នក​ប្រើ ៖"
+#~ msgid "_Delete"
+#~ msgstr "_លុប"
 
-#: ../../src/client/views/conversation-viewer.vala:1494
-msgid "_View Source"
-msgstr "_មើល​ប្រភព"
+#~ msgid "_Details"
+#~ msgstr "_លម្អិត"
 
-#. / 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 ""
+#~ msgid "_Justify"
+#~ msgstr "_ត្រឹម​សង​ខាង"
 
-#: ../../src/client/views/conversation-viewer.vala:1148
-msgid "but actually goes to"
-msgstr ""
+#~ msgid "_Left"
+#~ msgstr "_ឆ្វេង"
 
-#: ../../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "បៃ"
+#~ msgid "_Password:"
+#~ msgstr "_ពាក្យ​សម្ងាត់ ៖"
 
-#. / Placeholder filename for attachments with no filename.
-#: ../../src/client/views/conversation-viewer.vala:1799
-#: ../../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "គ្មាន"
+#~ msgid "_Right"
+#~ msgstr "_ស្ដាំ"
 
-#: ../../src/client/views/conversation-find-bar.vala:226
-msgid "not found"
-msgstr ""
+#~ msgid "_Send"
+#~ msgstr "_ផ្ញើ​ទៅ"
 
-#. / 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 "ទទួល​ស្គាល់​អ្នក​បក​ប្រែ"
+#~ msgid "_Username:"
+#~ msgstr "_ឈ្មោះ​អ្នក​ប្រើ ៖"
diff --git a/po/lt.po b/po/lt.po
index 6f88199..94cbee8 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -11,456 +11,430 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-09-09 05:14+0000\n"
-"PO-Revision-Date: 2015-09-09 17:04+0300\n"
-"Last-Translator: Aurimas Černius <aurisc4 gmail com>\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:08+0000\n"
+"Last-Translator: aurisc4 <aurisc4 gmail com>\n"
 "Language-Team: Lietuvių <gnome-lt lists akl lt>\n"
-"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Gtranslator 2.91.7\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Pašto klientas"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary Mail"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Siųsti ir gauti paštą"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "El. paštas;E. paštas;Paštas;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Rašyti laišką"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Siųsti el. paštu"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Siųsti failus naudojant Geary"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Išsaugoti"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"(n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:55+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: lt\n"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Pridėti"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Juodraščiai"
 
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "Papildomi %s adresai"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
+"Išsiųsti | Išsiųsti laiškai | Išsiųstas paštas | Išsiųstas el. paštas"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Paskyros"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr "Šlamšas | Brukalas | Šlamšto laiškai | Šlamšto el. laiškai"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Pirmas paskutinis"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Šiukšlinė | Ištrinti laiškai"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Welcome to Geary."
-msgstr "Sveiki įsijungę Geary."
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr "Archive | Archives | Archyvas | Archyvai"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Enter your account information to get started."
-msgstr "Norėdami pradėti įveskite naudotojo duomenis."
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Gautieji"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "2 weeks back"
-msgstr "2 savaičių senumo"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Juodraščiai"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "1 month back"
-msgstr "1 mėnesio senumo"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Išsiųstieji"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "3 months back"
-msgstr "3 mėnesių senumo"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Pažymėti"
 
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "6 months back"
-msgstr "6 mėnesių senumo"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Svarbūs"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "1 year back"
-msgstr "1 metų senumo"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Visi laiškai"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-msgid "2 years back"
-msgstr "2 metų senumo"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Šlamštas"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-msgid "4 years back"
-msgstr "4 metų senumo"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Šiukšlinė"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "Everything"
-msgstr "Viskas"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Siunčiamieji"
 
-#: ../src/client/accounts/add-edit-page.vala:280
-msgid "Edit"
-msgstr "Taisymas"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Paieška"
 
-#: ../src/client/accounts/add-edit-page.vala:282
-msgid "Preview"
-msgstr "Peržiūra"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Archyvas"
 
-#: ../src/client/accounts/add-edit-page.vala:723
-msgid "Remem_ber passwords"
-msgstr "Primin_ti slaptažodžius"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Nieko"
 
-#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "Primin_ti slaptažodį"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:764
-msgid "Unable to validate:\n"
-msgstr "Negalima patvirtinti:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:766
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Neteisingas naudotojo vardas.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:769
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; Pašto adresas pridėtas į Geary.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:773
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP prisijungimo klaida.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:776
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; IMAP neteisingas naudotojo vardas ar slaptažodis.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Kitas"
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP prisijungimo klaida.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "priedas"
 
-#: ../src/client/accounts/add-edit-page.vala:782
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; SMTP neteisingas naudotojo vardas ar slaptažodis.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "nematoma kopija"
 
-#: ../src/client/accounts/add-edit-page.vala:786
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Prisijungimo klaida.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "laiško tekstas"
 
-#: ../src/client/accounts/add-edit-page.vala:790
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; neteisingas naudotojo vardas ar slaptažodis.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "kopija"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Autorinės teisės priklauso 2011-2015 Yorba Foundation"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "nuo"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Aplankykite Yorba internetinį puslapį"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "tema"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Įjungiant Geary paslėpti pagrindinį langą"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "gavėjas"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Išvesti derinimo informaciją"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "man"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Įrašyti į žurnalą pokalbius"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(be temos)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Įrašyti į žurnalą ne tinklo pranešimus"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %b %-e, %Y at %-l:%M %p"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Įrašyti į žurnalą tinklo aktyvumą"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "%1$s, %2$s rašė:"
 
-#. / 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 "Įrašyti į žurnalą IMAP atsakymus"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s rašė:"
 
-#. / 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 "Įrašyti į žurnalą tinklo pranešimus"
+#. / 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:234
+msgid "On %s:"
+msgstr "%s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Įrašyti į žurnalą periodinį aktyvumą"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Persiųstas laiškas ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Įrašyti į žurnalą duomenų bazės užklausas (generuoja daug laiškų)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Nuo: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Įrašyti į žurnalą aplanko sutvarkymą"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Tema: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Leisti tikrinti su WebView"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Data: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Atšaukti visus serverių liudijimus su TLS perspėjimais"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Kam: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Rodyti programos versiją"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Kopija: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Naudokite %s naujam rašymo langui atverti"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "tuščia"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Prašome siųsti komentarus, pasiūlymus ir klaidas į:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Pašto klientas"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Klaida skaitant komandų eilutės pasirinkimus: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "Autorinės teisės priklauso 2011-2015 Yorba Foundation"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Neatpažintas komandinės eilutės pasirinkimas \"%s\"\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Aplankykite Yorba internetinį puslapį"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:61
 #| msgid "Move conversation"
 msgid "Delete conversation"
 msgstr "Trinti pokalbį"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Ištrinti pokalbį (Lyg2+Trinti)"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Ištrinti pokalbius (Lyg2+Trinti)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:67
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Perkelti pokalbį į šiukšlinę (Trinti, Grįžtamasis trynimas)"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:68
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "Perkelti pokalbius į šiukšlinę (Trinti, Grįžtamasis trynimas)"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Archyvuoti"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Archyvuoti pokalbį (A)"
 
-#: ../src/client/application/geary-controller.vala:75
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Archyvuoti pokalbius (A)"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Žymėti kaip š_lamštą"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Žymėti kaip ne š_lamštą"
 
-#: ../src/client/application/geary-controller.vala:81
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Žymėti pokalbį"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Žymėti pokalbius"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Pridėti žymą pokalbiui"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Pridėti žymas pokalbiams"
 
-#: ../src/client/application/geary-controller.vala:85
-#: ../src/client/application/geary-controller.vala:436
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Perkelti pokalbį"
 
-#: ../src/client/application/geary-controller.vala:86
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Perkelti pokalbius"
 
-#: ../src/client/application/geary-controller.vala:373
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "Var_totojai"
 
-#: ../src/client/application/geary-controller.vala:378
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Nustatymai"
 
-#: ../src/client/application/geary-controller.vala:382
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Pagalba"
 
-#: ../src/client/application/geary-controller.vala:386
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Apie"
 
-#: ../src/client/application/geary-controller.vala:390
-msgid "_Donate"
-msgstr "_Aukoti"
-
-#: ../src/client/application/geary-controller.vala:394
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Baigti"
 
-#: ../src/client/application/geary-controller.vala:399
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Žymėti kaip..."
 
-#: ../src/client/application/geary-controller.vala:405
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Žymėti kaip _skaitytą"
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Žymėti kaip _neskaitytą"
 
-#: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Žymėti žvaigždute"
 
-#: ../src/client/application/geary-controller.vala:422
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "At_žymėti"
 
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Pridėti žymą"
 
-#: ../src/client/application/geary-controller.vala:433
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Žymė"
 
-#: ../src/client/application/geary-controller.vala:437
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Perkelti"
 
-#: ../src/client/application/geary-controller.vala:441
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Rašyti naują laišką (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:445
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Atsakyti"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Atsakyti (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:450
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "At_sakyti visiems"
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Atsakyti visiems (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Persiųsti"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Persiųsti (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:496
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr "Išvalyti"
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr "Išvalyti šlamšto ir šiukšlių aplankus"
 
-#: ../src/client/application/geary-controller.vala:501
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr "Išvalyti š_lamštą"
 
-#: ../src/client/application/geary-controller.vala:505
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr "Išvalyti _šiukšlinę"
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:538
+#: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
 msgstr "Perjungti paieškos juostą"
 
-#: ../src/client/application/geary-controller.vala:752
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Nepavyko išsaugoti serverio patikimumo išimties"
 
-#: ../src/client/application/geary-controller.vala:989
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Jūsų nustatytmai yra nesaugūs"
 
-#: ../src/client/application/geary-controller.vala:990
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -470,17 +444,17 @@ msgstr ""
 "naudotojo vardas bei slaptažodis gali būti nuskaitytas tinkle.  Ar tikrai "
 "norite tęsti?"
 
-#: ../src/client/application/geary-controller.vala:991
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "Tęs_ti"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Siuntimo klaida"
 
-#: ../src/client/application/geary-controller.vala:1070
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -488,14 +462,12 @@ msgstr ""
 "Geary įvyko klaida siunčiant laišką.  Jeigu klaida išlieka, prašome ištrinti "
 "laišką iš Siunčiamieji aplanko."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Pašto siuntimo klaida"
 
-#: ../src/client/application/geary-controller.vala:1075
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -503,20 +475,15 @@ msgstr ""
 "Geary įvyko klaida įrašant laišką į siunčiamų laiškų aplanką.  Jeigu klaida "
 "išlieka, prašome ištrinti laišką iš Siunčiamieji aplanko."
 
-#: ../src/client/application/geary-controller.vala:1144
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Žymos"
 
-#. 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:1156
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Negalima atidaryti duomenų bazės %s"
 
-#: ../src/client/application/geary-controller.vala:1157
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -539,21 +506,19 @@ msgstr ""
 "Duomenų bazės perkūrimas pašalins visus lokalius laiškus bei prisegtukus. "
 "<b>Paštas esantis serveryje nebus įtakotas.</b>"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "_Atstatyti"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "Iš_eiti"
 
-#: ../src/client/application/geary-controller.vala:1168
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Negalima atstatyti duomenų bazės \"%s\""
 
-#: ../src/client/application/geary-controller.vala:1169
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -563,17 +528,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1191
-#: ../src/client/application/geary-controller.vala:1201
-#: ../src/client/application/geary-controller.vala:1212
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Negalima atidaryti lokalios pašto dėžutės %s"
 
-#: ../src/client/application/geary-controller.vala:1192
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -591,7 +552,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1202
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -605,7 +566,7 @@ msgstr ""
 "\n"
 "Prašome įdiegti naujausią Geary versiją ir bandyti dar kartą."
 
-#: ../src/client/application/geary-controller.vala:1213
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -617,27 +578,29 @@ msgstr ""
 "\n"
 "Prašome patikrinti tinklą ir iš naujo paleisti Geary."
 
-#: ../src/client/application/geary-controller.vala:1721
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "Apie %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1724
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
-msgstr "Vertėjų sąrašas"
+msgstr ""
+"Vertėjų sąrašas\n"
+"\n"
+"Launchpad Contributions:\n"
+"  aurisc4 https://launchpad.net/~aurisc4";
 
-#: ../src/client/application/geary-controller.vala:1990
+#: ../src/client/application/geary-controller.vala:1976
 msgid "Undo move (Ctrl+Z)"
 msgstr "Atšaukti perkelimą (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2000
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Ar tikrai norite atidaryti \"%s\"?"
 
-#: ../src/client/application/geary-controller.vala:2001
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -645,301 +608,535 @@ msgstr ""
 "Prisegti failai gali pakenkti jūsų sistemai.  Atidarykite failus tik iš "
 "patikimų šaltinių."
 
-#: ../src/client/application/geary-controller.vala:2002
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Nebeklausti _"
 
-#: ../src/client/application/geary-controller.vala:2020
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Failas su pavadinimu \"%s\" jau yra.  Norite jį pakeisti?"
 
-#: ../src/client/application/geary-controller.vala:2022
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "Toks failas jau yra \"%s\".  Pakeitimas perrašys failo turinį."
 
-#: ../src/client/application/geary-controller.vala:2025
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2323
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Užverti atvertus juodraščius?"
 
-#: ../src/client/application/geary-controller.vala:2453
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr "Išvalyti visus laiškus iš %s katalogo?"
 
-#: ../src/client/application/geary-controller.vala:2454
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr "Tai pašalina laiškus iš Geary ir jūsų el. pašto serverio."
 
-#: ../src/client/application/geary-controller.vala:2455
+#: ../src/client/application/geary-controller.vala:2441
 msgid "This cannot be undone."
 msgstr "Tai negali būti atšaukta."
 
-#: ../src/client/application/geary-controller.vala:2456
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr "Išvalyti %s"
 
-#: ../src/client/application/geary-controller.vala:2473
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 msgid "Error emptying %s"
 msgstr "Klaida išvalant %s"
 
-#: ../src/client/application/geary-controller.vala:2503
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Norite visam laikui ištrinti šį laišką?"
 msgstr[1] "Norite visam laikui ištrinti šiuos laiškus?"
 msgstr[2] "Norite visam laikui ištrinti šiuos laiškus?"
 
-#: ../src/client/application/geary-controller.vala:2505
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: ../src/client/application/geary-controller.vala:2536
+#: ../src/client/application/geary-controller.vala:2522
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Atšaukti archyvavimą (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2551
+#: ../src/client/application/geary-controller.vala:2537
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Atšaukti išmetimą (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2604
+#: ../src/client/application/geary-controller.vala:2590
 msgid "Undo (Ctrl+Z)"
 msgstr "Atšaukti (Ctrl+Z)"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i atitikmuo"
-msgstr[1] "%i atitikmenys"
-msgstr[2] "%i atitikmenų"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Įjungiant Geary paslėpti pagrindinį langą"
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i atitikmuo (perkeltas)"
-msgstr[1] "%i atitikmenys (perkelti)"
-msgstr[2] "%i atitikmenų (perkelti)"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Išvesti derinimo informaciją"
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "nerasta"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Įrašyti į žurnalą pokalbius"
 
-#: ../src/client/components/main-window.vala:430
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Įrašyti į žurnalą ne tinklo pranešimus"
 
-#: ../src/client/components/search-bar.vala:10
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Paieška"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Įrašyti į žurnalą tinklo aktyvumą"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:25
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Ieškoti visame naudotojo pašte pagal žodžius (Ctrl+S)"
+#. / 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 "Įrašyti į žurnalą IMAP atsakymus"
 
-#: ../src/client/components/search-bar.vala:118
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indeksuojama %s paskyra"
+#. / 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 "Įrašyti į žurnalą tinklo pranešimus"
 
-#: ../src/client/components/search-bar.vala:129
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Ieškoti %s naudotojo"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Įrašyti į žurnalą periodinį aktyvumą"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Siunčiama..."
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Įrašyti į žurnalą duomenų bazės užklausas (generuoja daug laiškų)"
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_Gerai"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Įrašyti į žurnalą aplanko sutvarkymą"
 
-#: ../src/client/components/stock.vala:19
-#: ../ui/edit_alternate_emails.glade.h:3 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Atšaukti"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Leisti tikrinti su WebView"
 
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Uždaryti"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Atšaukti visus serverių liudijimus su TLS perspėjimais"
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Atmesti"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Rodyti programos versiją"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Atidaryti"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Naudokite %s naujam rašymo langui atverti"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Spausdinti..."
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Prašome siųsti komentarus, pasiūlymus ir klaidas į:"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Ištrinti"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Klaida skaitant komandų eilutės pasirinkimus: %s\n"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "Pasirinkti _viską"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Neatpažintas komandinės eilutės pasirinkimas \"%s\"\n"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Paimti"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Nauji laiškai"
 
-#: ../src/client/composer/composer-widget.vala:73
-msgid "Saved"
-msgstr "Išsaugota"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d naujas laiškas"
+msgstr[1] "%d nauji laiškai"
+msgstr[2] "%d naujų laiškų"
 
-#: ../src/client/composer/composer-widget.vala:74
-msgid "Saving"
-msgstr "Saugoma"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, iš viso %d naujas laiškas"
+msgstr[1] "%s, iš viso %d nauji laiškai"
+msgstr[2] "%s, iš viso %d naujų laiškų"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "Error saving"
-msgstr "Saugojimo klaida"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d naujas laiškas %s)"
+msgstr[1] ""
+"%s\n"
+"(%d nauji laiškai %s)"
+msgstr[2] ""
+"%s\n"
+"(%d naujų laiškų %s)"
 
-#: ../src/client/composer/composer-widget.vala:76
-msgid "Press Backspace to delete quote"
-msgstr "Paspauskite naikinimo klavišą citatai ištrinti"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Atverti"
 
-#: ../src/client/composer/composer-widget.vala:77
-msgid "New Message"
-msgstr "Naujas laiškas"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Aš"
 
-#. A 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:138
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr "Nepatikimas ryšys: %s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr "%s pašto serverio iš %s:%u tapatumo nepavyko patvirtinti."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
 msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
-"prisegtas|prisegta|prisegu|prisegiau|pridėtas|pridėta|pridedu|pridėjau|"
-"failas|failai|failų|byla|bylos|bylų|rinkmena|rinkmenos|rinkmenų|prisegtukas|"
-"priedas|priedai"
+"Pasirinkus \"Pasitikėti šiuo serveriu\" ar \"Visada pasitikėti šiuo "
+"serveriu\" jūsų naudotojo vardas ir slaptažodis gali būti perduoti nesaugiu "
+"būdu."
 
-#: ../src/client/composer/composer-widget.vala:1102
-#: ../src/client/composer/composer-widget.vala:1106
-msgid "Do you want to discard this message?"
-msgstr "Norite atmesti šį laišką?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"Pasirinkus \"Nepasitikėti šiuo serveriu\" Geary nebesijungs prie šio "
+"serverio."
 
-#: ../src/client/composer/composer-widget.vala:1262
-msgid "Send message with an empty subject and body?"
-msgstr "Ar siųsti laišką be teksto ir temos?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Geary nepridės ir neatnaujins šios el. pašto paskyros."
 
-#: ../src/client/composer/composer-widget.vala:1264
-msgid "Send message with an empty subject?"
-msgstr "Ar siųsti laišką be temos?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"Pasirinkus \"Nepasitikėti šiuo serveriu\" Geary nebeaptarnaus šios paskyros."
 
-#: ../src/client/composer/composer-widget.vala:1266
-msgid "Send message with an empty body?"
-msgstr "Ar siųsti laišką be teksto?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr "Geary išsijungs jei neturėsite jokių kitų atvertų el. pašto paskyrų."
 
-#: ../src/client/composer/composer-widget.vala:1268
-msgid "Send message without an attachment?"
-msgstr "Ar siųsti laišką be priedų?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Susisiekite su savo sistemos administratoriumi arba el. pašto paslaugos "
+"tiekėju jei turite kokių nors klausimų."
 
-#: ../src/client/composer/composer-widget.vala:1530
-msgid "Cannot add attachment"
-msgstr "Negalima pridėti"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr "Serverio liudijimas pasirašytas nežinomo leidėjo"
 
-#: ../src/client/composer/composer-widget.vala:1541
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "\"%s\" negali būti rastas."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr "Serverio tapatybė nesutampa su liudijime nurodytąja"
 
-#: ../src/client/composer/composer-widget.vala:1548
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" aplankas."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Serverio liudijimas nebegalioja"
 
-#: ../src/client/composer/composer-widget.vala:1555
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" tusčias failas."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "Serverio liudijimas nebuvo aktyvuotas"
 
-#: ../src/client/composer/composer-widget.vala:1569
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "\"%s\" negali būti atidarytas skaitymui."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "Serverio liudijimas buvo atšauktas ir dabar yra negaliojantis"
 
-#: ../src/client/composer/composer-widget.vala:1576
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" prisegtas siuntimui."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "Serverio liudijimas laikomas neužtikrinančiu saugumo"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1585
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr "Tikrinant serverio liudijimą įvyko klaida"
 
-#: ../src/client/composer/composer-widget.vala:1645
-msgid "To: "
-msgstr "Kam: "
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr "Norint tęsti, Geary reikalingas jūsų el. pašto slaptažodis"
 
-#: ../src/client/composer/composer-widget.vala:1648
-msgid "Cc: "
-msgstr "Kopija: "
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Pasirinkite failą"
 
-#: ../src/client/composer/composer-widget.vala:1651
-msgid "Bcc: "
-msgstr "Nematoma kopija: "
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Prisegti"
 
-#: ../src/client/composer/composer-widget.vala:1654
-msgid "Reply-To: "
-msgstr "Kam _atsakyti:"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr "Papildomi %s adresai"
 
-#: ../src/client/composer/composer-widget.vala:1887
-msgid "Select Color"
-msgstr "Pasirinkti spalvą"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Paskyros"
 
-#. 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:2322
-#, c-format
-msgid "%1$s via %2$s"
-msgstr "%1$s per %2$s"
+#. / 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 "Pirmas paskutinis"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2364
-msgid "_From:"
-msgstr "_Nuo:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Sveiki įsijungę Geary."
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Aš"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Norėdami pradėti įveskite naudotojo duomenis."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 savaičių senumo"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 mėnesio senumo"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 mėnesių senumo"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 mėnesių senumo"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 metų senumo"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "2 metų senumo"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "4 metų senumo"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Viskas"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "Taisymas"
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr "Peržiūra"
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "Primin_ti slaptažodžius"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "Primin_ti slaptažodį"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Negalima patvirtinti:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Neteisingas naudotojo vardas.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Pašto adresas pridėtas į Geary.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; IMAP prisijungimo klaida.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; IMAP neteisingas naudotojo vardas ar slaptažodis.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; SMTP prisijungimo klaida.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; SMTP neteisingas naudotojo vardas ar slaptažodis.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Prisijungimo klaida.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; neteisingas naudotojo vardas ar slaptažodis.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Išsaugoti"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Pridėti"
+
+#. / 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 "%l:%M %P"
+
+#. / 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 "%b %-e"
+
+#. / 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 "%B %-e, %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 "%B %-e, %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 "%B %-e, %Y %-l:%M %P"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Dabar"
+
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "Prieš %dm"
+msgstr[1] "Prieš %dm"
+msgstr[2] "Prieš %dm"
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "Prieš %dh"
+msgstr[1] "Prieš %dh"
+msgstr[2] "Prieš %dh"
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Vakar"
+
+#. / 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
+msgid "%A"
+msgstr "%A"
+
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "baitai"
+
+#: ../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/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d laiškas"
+msgstr[1] "%d laiškai"
+msgstr[2] "%d laiškų"
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d neskaityta"
+msgstr[1] "%d neskaityta"
+msgstr[2] "%d neskaityta"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Gautieji"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Ieškoti %s naudotojo"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d rezultatas"
+msgstr[1] "%d rezultatai"
+msgstr[2] "%d rezultatų"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "Nepasirinkti jokie pokalbiai."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "%u pasirinktas pokalbis."
@@ -995,7 +1192,6 @@ msgid "Date:"
 msgstr "Data:"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "%u perskaitytas laiškas"
@@ -1003,33 +1199,31 @@ msgstr[1] "%u perskaityti laiškai"
 msgstr[2] "%u perskaitytų laiškų"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
-msgstr "Šis pranešimas buvo sėkmingai išsiųstas, bet nepavyko jo įrašyti į %s."
+msgstr ""
+"Šis pranešimas buvo sėkmingai išsiųstas, bet nepavyko jo įrašyti į %s."
 
-#. Add a menu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Kopijuoti"
 
-#. Add a menu item for copying the address.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "Kopijuoti _pašto adresą"
 
-#. Add a menu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Kopijuoti _nuorodą"
 
-#. Select message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "Pasirinkti _laišką"
 
-#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Pasirinkti _viską"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "_Tikrinti"
@@ -1042,7 +1236,6 @@ msgstr "Ši nuoroda rodo į"
 msgid "but actually goes to"
 msgstr "bet iš tiesų nukreipia į"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
 msgstr " (Negaliojantis?)"
@@ -1066,12 +1259,10 @@ msgstr[0] "Išsaugoti Pri_segtuką"
 msgstr[1] "Išsaugoti Pri_segtukus"
 msgstr[2] "Išsaugoti Pri_segtukus"
 
-#. Reply to all on a message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
-#. Mark as read/unread.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "_Žymėti kaip skaitytą"
@@ -1084,1078 +1275,628 @@ msgstr "_Žymėti kaip neskaitytą"
 msgid "Mark Unread From _Here"
 msgstr "Žymėti neskaitytą nuo _čia"
 
-#. Separator.
-#. View original message source.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "_Žiūrėti kodą"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:378
-msgid "none"
-msgstr "tuščia"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "Klaida bandant atidaryti numatytą teksto redaktorių."
 
 #: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s - Pokalbio tikrintojas"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Pasirinkite failą"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Išsaugota"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Prisegti"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Saugoma"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
-msgid "Untrusted Connection: %s"
-msgstr "Nepatikimas ryšys: %s"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Saugojimo klaida"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
-msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr "%s pašto serverio iš %s:%u tapatumo nepavyko patvirtinti."
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "Paspauskite naikinimo klavišą citatai ištrinti"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
-msgid ""
-"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-"your username and password to be transmitted insecurely."
-msgstr ""
-"Pasirinkus \"Pasitikėti šiuo serveriu\" ar \"Visada pasitikėti šiuo serveriu"
-"\" jūsų naudotojo vardas ir slaptažodis gali būti perduoti nesaugiu būdu."
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Naujas laiškas"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-"server."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Pasirinkus \"Nepasitikėti šiuo serveriu\" Geary nebesijungs prie šio "
-"serverio."
+"prisegtas|prisegta|prisegu|prisegiau|pridėtas|pridėta|pridedu|pridėjau|failas"
+"|failai|failų|byla|bylos|bylų|rinkmena|rinkmenos|rinkmenų|prisegtukas|priedas"
+"|priedai"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
-msgid "Geary will not add or update this email account."
-msgstr "Geary nepridės ir neatnaujins šios el. pašto paskyros."
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Norite atmesti šį laišką?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-"this account."
-msgstr ""
-"Pasirinkus \"Nepasitikėti šiuo serveriu\" Geary nebeaptarnaus šios paskyros."
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Ar siųsti laišką be teksto ir temos?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr "Geary išsijungs jei neturėsite jokių kitų atvertų el. pašto paskyrų."
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Ar siųsti laišką be temos?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
-msgid ""
-"Contact your system administrator or email service provider if you have any "
-"question about these issues."
-msgstr ""
-"Susisiekite su savo sistemos administratoriumi arba el. pašto paslaugos "
-"tiekėju jei turite kokių nors klausimų."
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Ar siųsti laišką be teksto?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
-msgstr "Serverio liudijimas pasirašytas nežinomo leidėjo"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Ar siųsti laišką be priedų?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
-msgid "The server's identity does not match the identity in the certificate"
-msgstr "Serverio tapatybė nesutampa su liudijime nurodytąja"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Negalima pridėti"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
-msgid "The server's certificate has expired"
-msgstr "Serverio liudijimas nebegalioja"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "\"%s\" negali būti rastas."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
-msgid "The server's certificate has not been activated"
-msgstr "Serverio liudijimas nebuvo aktyvuotas"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" aplankas."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
-msgid "The server's certificate has been revoked and is now invalid"
-msgstr "Serverio liudijimas buvo atšauktas ir dabar yra negaliojantis"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" tusčias failas."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
-msgid "The server's certificate is considered insecure"
-msgstr "Serverio liudijimas laikomas neužtikrinančiu saugumo"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "\"%s\" negali būti atidarytas skaitymui."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
-msgid "An error has occurred processing the server's certificate"
-msgstr "Tikrinant serverio liudijimą įvyko klaida"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "\"%s\" prisegtas siuntimui."
 
-#. 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 "Geary requires your email password to continue"
-msgstr "Norint tęsti, Geary reikalingas jūsų el. pašto slaptažodis"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. 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 laiškas"
-msgstr[1] "%d laiškai"
-msgstr[2] "%d laiškų"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Kam: "
 
-#. / 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 neskaityta"
-msgstr[1] "%d neskaityta"
-msgstr[2] "%d neskaityta"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Kopija: "
 
-#. / 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/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Nematoma kopija: "
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Gautieji"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "Kam _atsakyti: "
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d rezultatas"
-msgstr[1] "%d rezultatai"
-msgstr[2] "%d rezultatų"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Pasirinkti spalvą"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Nauji laiškai"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr "%1$s per %2$s"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d naujas laiškas"
-msgstr[1] "%d nauji laiškai"
-msgstr[2] "%d naujų laiškų"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_Nuo:"
 
-#: ../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] "%s, iš viso %d naujas laiškas"
-msgstr[1] "%s, iš viso %d nauji laiškai"
-msgstr[2] "%s, iš viso %d naujų laiškų"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 naujas laiškas %s)"
-msgstr[1] ""
-"%s\n"
-"(%d nauji laiškai %s)"
-msgstr[2] ""
-"%s\n"
-"(%d naujų laiškų %s)"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Siunčiama..."
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Atverti"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i atitikmuo"
+msgstr[1] "%i atitikmenys"
+msgstr[2] "%i atitikmenų"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i atitikmuo (perkeltas)"
+msgstr[1] "%i atitikmenys (perkelti)"
+msgstr[2] "%i atitikmenų (perkelti)"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "nerasta"
 
-#. / 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"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_Gerai"
 
-#. / 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 "%b %-e"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Atšaukti"
 
-#. / 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"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Uždaryti"
 
-#. / 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 "%B %-e, %Y %-l:%M %P"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Atmesti"
 
-#. / 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"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Atidaryti"
 
-#. / 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 "%B %-e, %Y %-l:%M %P"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Spausdinti..."
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Dabar"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Ištrinti"
 
-#: ../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "Prieš %dm"
-msgstr[1] "Prieš %dm"
-msgstr[2] "Prieš %dm"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Paimti"
 
-#: ../src/client/util/util-date.vala:171
-#, c-format
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "Prieš %dh"
-msgstr[1] "Prieš %dh"
-msgstr[2] "Prieš %dh"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Ieškoti visame naudotojo pašte pagal žodžius (Ctrl+S)"
 
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "Vakar"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Indeksuojama %s paskyra"
 
-#. / 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"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(be temos)"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary Mail"
 
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "baitai"
+#~ msgid "Send and receive email"
+#~ msgstr "Siųsti ir gauti paštą"
 
-#: ../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "El. paštas;E. paštas;Paštas;"
 
-#: ../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#~ msgid "Compose Message"
+#~ msgstr "Rašyti laišką"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#~ msgid "Send by email"
+#~ msgstr "Siųsti el. paštu"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#~ msgid "Send files using Geary"
+#~ msgstr "Siųsti failus naudojant Geary"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#~ msgid "_Donate"
+#~ msgstr "_Aukoti"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Negalima pašalinti naudotojo</span> "
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Teksto rinkimo langas naudojamas naudotojo. Išsiųskite arba pašalinkite "
+#~ "laišką ir bandykite dar kartą"
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Kitas"
+#~ msgid "Add account"
+#~ msgstr "Pridėti naudotoją"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#~ msgid "Edit account"
+#~ msgstr "Redaguoti naudotoją"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#~ msgid "Remove account"
+#~ msgstr "Ištrinti naudotoją"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Gautieji"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Prašome palaukti, kol Geary patikrins jūsų naudotoją."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Juodraščiai"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Nepatikimas ryšys"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Išsiųstieji"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "_Visada pasitikėti šiuo serveriu"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Pažymėti"
+#~ msgid "_Trust This Server"
+#~ msgstr "_Pasitikėti šiuo serveriu"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Svarbūs"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "_Nepasitikėti šiuo serveriu"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Visi laiškai"
+#~ msgid "_Undo"
+#~ msgstr "_Atšaukti"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Šlamštas"
+#~ msgid "_Redo"
+#~ msgstr "_Kartoti"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Šiukšlinė"
+#~ msgid "Cu_t"
+#~ msgstr "Iškirp_ti"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Siunčiamieji"
+#~ msgid "_Paste"
+#~ msgstr "_Įklijuoti"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Archyvas"
+#~ msgid "_Left"
+#~ msgstr "_Kairėje"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-msgstr "Nieko"
+#~ msgid "_Right"
+#~ msgstr "_Dešinėje"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-msgid "attachment"
-msgstr "priedas"
+#~ msgid "_Center"
+#~ msgstr "_Centre"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
-msgstr "nematoma kopija"
+#~ msgid "_Justify"
+#~ msgstr "_Paskirstytas"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
-msgstr "laiško tekstas"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Nuoroda (Ctrl+L)"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "cc"
-msgstr "kopija"
+#~ msgid "C_olor"
+#~ msgstr "Spal_va"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
-msgstr "nuo"
+#~ msgid "More options"
+#~ msgstr "Daugiau pasirinkimų"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-msgid "subject"
-msgstr "tema"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Cituoti tekstą  (Ctrl+])"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
-msgstr "gavėjas"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Nuimti teksto citavimą (Ctrl+[)"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
-msgstr "man"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Ištrinti formatavimą (Ctrl+Space)"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-msgid "Drafts | Draft"
-msgstr "Juodraščiai"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Įdėti _su formatavimu"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "Išsiųsti | Išsiųsti laiškai | Išsiųstas paštas | Išsiųstas el. paštas"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Paryškintas (Ctrl+B)"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
-msgstr "Šlamšas | Brukalas | Šlamšto laiškai | Šlamšto el. laiškai"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Pakreiptas (Ctrl+I)"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Šiukšlinė | Ištrinti laiškai"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Pabrauktas (Ctrl+U)"
 
-#. List of folder names to match for Archive, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
-msgid "Archive | Archives"
-msgstr "Archive | Archives | Archyvas | Archyvai"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Perbrauktas (Ctrl+K)"
 
-#. / 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:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %b %-e, %Y at %-l:%M %p"
+#~ msgid "_Rich Text"
+#~ msgstr "_Raiškus tekstas"
 
-#. / 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:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "%1$s, %2$s rašė:"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Rodyti išplėstinius laukus"
 
-#. / 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:228
-#, c-format
-msgid "%s wrote:"
-msgstr "%s rašė:"
+#~ msgctxt "Label"
+#~ msgid "Close and Save"
+#~ msgstr "Užverti ir įrašyti"
 
-#. / 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:234
-#, c-format
-msgid "On %s:"
-msgstr "%s:"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "Užverti ir įrašyti"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Persiųstas laiškas ----------"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "Užverti ir įrašyti"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "Nuo: %s\n"
+#~ msgctxt "Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Užverti ir neįrašyti"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Tema: %s\n"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Užverti ir neįrašyti"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "Data: %s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "Užverti ir neįrašyti"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "Kam: %s\n"
+#~ msgid "Lar_ge"
+#~ msgstr "Dide_lis"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Kopija: %s\n"
+#~ msgid "Large"
+#~ msgstr "Didelis"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Negalima pašalinti naudotojo</span> "
+#~ msgid "_Medium"
+#~ msgstr "_Vidutinis"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Teksto rinkimo langas naudojamas naudotojo. Išsiųskite arba pašalinkite "
-"laišką ir bandykite dar kartą"
+#~ msgid "Medium"
+#~ msgstr "Vidutinis"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Pridėti naudotoją"
+#~ msgid "_Small"
+#~ msgstr "_Mažas"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Redaguoti naudotoją"
+#~ msgid "Small"
+#~ msgstr "Mažas"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Ištrinti naudotoją"
+#~ msgid "S_ans Serif"
+#~ msgstr "S_ans Serif"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Prašome palaukti, kol Geary patikrins jūsų naudotoją."
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Nepatikimas ryšys"
+#~ msgid "S_erif"
+#~ msgstr "S_erif"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "_Visada pasitikėti šiuo serveriu"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "_Pasitikėti šiuo serveriu"
+#~ msgid "_Fixed Width"
+#~ msgstr "_Nurodyto pločio"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "_Nepasitikėti šiuo serveriu"
+#~ msgid "Fixed Width"
+#~ msgstr "Nurodyti pločio"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Atšaukti"
+#~ msgid "Detach"
+#~ msgstr "_Atsegti"
 
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Kartoti"
-
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "Iškirp_ti"
-
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "_Įklijuoti"
-
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Kairėje"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Dešinėje"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Centre"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Paskirstytas"
-
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Nuoroda (Ctrl+L)"
-
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "Spal_va"
-
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Daugiau pasirinkimų"
-
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Cituoti tekstą  (Ctrl+])"
-
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Nuimti teksto citavimą (Ctrl+[)"
-
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Ištrinti formatavimą (Ctrl+Space)"
-
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Įdėti _su formatavimu"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Paryškintas (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Pakreiptas (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Pabrauktas (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Perbrauktas (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "_Raiškus tekstas"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Rodyti išplėstinius laukus"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "Užverti ir įrašyti"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "Užverti ir įrašyti"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "Užverti ir įrašyti"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "Užverti ir neįrašyti"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "Užverti ir neįrašyti"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "Užverti ir neįrašyti"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "Dide_lis"
-
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "Didelis"
-
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "_Vidutinis"
-
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "Vidutinis"
-
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "_Mažas"
-
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "Mažas"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
-
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "S_erif"
-
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "Serif"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "_Nurodyto pločio"
-
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "Nurodyti pločio"
-
-#: ../ui/composer.glade.h:42
-msgid "Detach"
-msgstr "_Atsegti"
-
-#: ../ui/composer.glade.h:43
-msgid "Detach (Ctrl+D)"
-msgstr "Atsegti (Ctrl+D)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_Siūsti"
-
-#: ../ui/composer.glade.h:45
-msgid "Send"
-msgstr "_Siųsti"
-
-#: ../ui/composer.glade.h:46
-msgid "Send (Ctrl+Enter)"
-msgstr "Siųsti (Ctrl+Enter)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "_Pridėti failą"
-
-#: ../ui/composer.glade.h:48
-msgid "Attach File"
-msgstr "Prisegti failą"
-
-#: ../ui/composer.glade.h:49
-msgid "_Include Original Attachments"
-msgstr "_Pridėti pradinius prisegtukus"
-
-#: ../ui/composer.glade.h:50
-msgid "Include Original Attachments"
-msgstr "Įtraukti pradinius priedus"
-
-#: ../ui/composer.glade.h:51
-msgid "Application Menu"
-msgstr "Programos meniu"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:53
-msgid "_To"
-msgstr "_Kam:"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Atsegti (Ctrl+D)"
 
-#: ../ui/composer.glade.h:54
-msgid "_Cc"
-msgstr "_Kopija:"
+#~ msgid "_Send"
+#~ msgstr "_Siūsti"
 
-#: ../ui/composer.glade.h:55
-msgid "_Subject"
-msgstr "_Tema"
+#~ msgid "Send"
+#~ msgstr "_Siųsti"
 
-#: ../ui/composer.glade.h:56
-msgid "_Bcc"
-msgstr "_Nematoma kopija:"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Siųsti (Ctrl+Enter)"
 
-#: ../ui/composer.glade.h:57
-msgid "_Reply-To"
-msgstr "_Atsakyti"
+#~ msgid "_Attach File"
+#~ msgstr "_Pridėti failą"
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:59
-msgid "From"
-msgstr "Nuo:"
+#~ msgid "Attach File"
+#~ msgstr "Prisegti failą"
 
-#: ../ui/composer.glade.h:60
-msgid "Drop files here"
-msgstr "Tempti failus čia"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Pridėti pradinius prisegtukus"
 
-#: ../ui/composer.glade.h:61
-msgid "To add them as attachments"
-msgstr "Pridėti kaip prisegtukus"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Įtraukti pradinius priedus"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-#| msgid "E_mail address"
-msgid "Remove email address"
-msgstr "Pašalinti el. paš_to adresą"
+#~ msgid "Application Menu"
+#~ msgstr "Programos meniu"
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"Kai kurios el. pašto tarnybos reikalauja sukonfigūruoti papildomus adresus "
-"serveryje.  Susisiekite su paslaugos tiekėju detalesnei informacijai."
+#~ msgid "_To"
+#~ msgstr "_Kam:"
 
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "Atna_ujinti"
+#~ msgid "_Cc"
+#~ msgstr "_Kopija:"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Rasti:"
+#~ msgid "_Subject"
+#~ msgstr "_Tema"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Ankstesnis"
+#~ msgid "_Bcc"
+#~ msgstr "_Nematoma kopija:"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Kitas"
+#~ msgid "_Reply-To"
+#~ msgstr "_Atsakyti"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "Skirti _raidžių registrą"
+#~ msgid "From"
+#~ msgstr "Nuo:"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "žyma"
+#~ msgid "Drop files here"
+#~ msgstr "Tempti failus čia"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Slaptažodis"
+#~ msgid "To add them as attachments"
+#~ msgstr "Pridėti kaip prisegtukus"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "El. paš_to adresas"
+#~| msgid "E_mail address"
+#~ msgid "Remove email address"
+#~ msgstr "Pašalinti el. paš_to adresą"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Slaptažodis"
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "Kai kurios el. pašto tarnybos reikalauja sukonfigūruoti papildomus adresus "
+#~ "serveryje.  Susisiekite su paslaugos tiekėju detalesnei informacijai."
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "P_aslauga"
+#~ msgid "_Update"
+#~ msgstr "Atna_ujinti"
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "V_ardas"
+#~ msgid "Find:"
+#~ msgstr "Rasti:"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "V_artotojo vardas"
+#~ msgid "_Previous"
+#~ msgstr "_Ankstesnis"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Darbas, namai ir t.t."
+#~ msgid "_Next"
+#~ msgstr "_Kitas"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "Į_rašyti išsiųstą paštą"
+#~ msgid "_Case sensitive"
+#~ msgstr "Skirti _raidžių registrą"
 
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
-msgstr "_Papildomi el. pašto adresai…"
+#~ msgid "label"
+#~ msgstr "žyma"
 
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "IMAP nustatymai"
+#~ msgid "Password"
+#~ msgstr "Slaptažodis"
 
-#: ../ui/login.glade.h:12
-msgid "Se_rver"
-msgstr "Ser_veris"
+#~ msgid "E_mail address"
+#~ msgstr "El. paš_to adresas"
 
-#: ../ui/login.glade.h:13
-msgid "P_ort"
-msgstr "P_ortas"
+#~ msgid "_Password"
+#~ msgstr "_Slaptažodis"
 
-#: ../ui/login.glade.h:14
-msgid "Ser_ver"
-msgstr "Ser_veris"
+#~ msgid "S_ervice"
+#~ msgstr "P_aslauga"
 
-#: ../ui/login.glade.h:15
-msgid "Por_t"
-msgstr "Por_tas"
+#~ msgid "N_ame"
+#~ msgstr "V_ardas"
 
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "SMTP nustatymai"
+#~ msgid "N_ickname"
+#~ msgstr "V_artotojo vardas"
 
-#: ../ui/login.glade.h:17
-msgid "User_name"
-msgstr "Naudotojo _vardas"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Darbas, namai ir t.t."
 
-#: ../ui/login.glade.h:18
-msgid "Pass_word"
-msgstr "Slapta_žodis"
+#~ msgid "_Save sent mail"
+#~ msgstr "Į_rašyti išsiųstą paštą"
 
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr "SMTP naudotojas"
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "_Papildomi el. pašto adresai…"
 
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr "SMTP slaptažodis"
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP nustatymai"
 
-#: ../ui/login.glade.h:21
-msgid "_Username"
-msgstr "_Naudotojas"
+#~ msgid "Se_rver"
+#~ msgstr "Ser_veris"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr "IMAP naudotojas"
+#~ msgid "P_ort"
+#~ msgstr "P_ortas"
 
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr "IMAP slaptažodis"
+#~ msgid "Ser_ver"
+#~ msgstr "Ser_veris"
 
-#: ../ui/login.glade.h:24
-msgid "Encr_yption"
-msgstr "Šifra_vimas"
+#~ msgid "Por_t"
+#~ msgstr "Por_tas"
 
-#: ../ui/login.glade.h:25
-msgid "Encrypt_ion"
-msgstr "Šifravi_mas"
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP nustatymai"
 
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "User_name"
+#~ msgstr "Naudotojo _vardas"
 
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "Pass_word"
+#~ msgstr "Slapta_žodis"
 
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "Patvirtinimas nerei_kalingas"
+#~ msgid "SMTP username"
+#~ msgstr "SMTP naudotojas"
 
-#: ../ui/login.glade.h:30
-msgid "Use IMAP cre_dentials"
-msgstr "Naudoti IMAP į_galiojimus"
+#~ msgid "SMTP password"
+#~ msgstr "SMTP slaptažodis"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Rašyklė"
+#~ msgid "_Username"
+#~ msgstr "_Naudotojas"
 
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr "Išsaugoti _juodraščius serveryje"
+#~ msgid "IMAP username"
+#~ msgstr "IMAP naudotojas"
 
-#: ../ui/login.glade.h:33
-msgid "Si_gn emails (HTML allowed):"
-msgstr "Pasirašyti el. laiškus (HTML leidžiamas):"
+#~ msgid "IMAP password"
+#~ msgstr "IMAP slaptažodis"
 
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "Vieta"
+#~ msgid "Encr_yption"
+#~ msgstr "Šifra_vimas"
 
-#: ../ui/login.glade.h:35
-msgid "_Download mail"
-msgstr "_Atsiųsti paštą"
+#~ msgid "Encrypt_ion"
+#~ msgstr "Šifravi_mas"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "SMTP Patvirtinimas"
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "Naudotojas"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Prisiminti slaptažodį"
+#~ msgid "No authentication re_quired"
+#~ msgstr "Patvirtinimas nerei_kalingas"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Nustatyti tapatybę"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Naudoti IMAP į_galiojimus"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Skaitoma"
+#~ msgid "Composer"
+#~ msgstr "Rašyklė"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "_Automatiškai pasirinkti kitą laišką"
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Išsaugoti _juodraščius serveryje"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "_Rodyti pokalbio peržiūrą"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "Pasirašyti el. laiškus (HTML leidžiamas):"
 
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr "Naudoti _trijų skydelių vaizdą"
+#~ msgid "Storage"
+#~ msgstr "Vieta"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "Įjungti _kalbos tikrinimą"
+#~ msgid "_Download mail"
+#~ msgstr "_Atsiųsti paštą"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "Pranešimai"
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP Patvirtinimas"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "_Groti pranešimų garsus"
+#~ msgid "Username"
+#~ msgstr "Naudotojas"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "Rodyti _pranešimus gavus naują laišką"
+#~ msgid "_Remember password"
+#~ msgstr "_Prisiminti slaptažodį"
 
-#: ../ui/preferences.glade.h:10
-msgid "Always _watch for new mail"
-msgstr "Rodyti _pranešimus gavus naują laišką"
+#~ msgid "_Authenticate"
+#~ msgstr "_Nustatyti tapatybę"
 
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr "Geary veiks fone ir praneš apie naujus laiškus"
+#~ msgid "Reading"
+#~ msgstr "Skaitoma"
 
-#: ../ui/preferences.glade.h:12
-#| msgid "_Preferences"
-msgid "Preferences"
-msgstr "Nustatymai"
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Automatiškai pasirinkti kitą laišką"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Ar tikrai norite ištrintį šį naudotoją?"
-"</span> "
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Rodyti pokalbio peržiūrą"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Visi laiškai susiję su šiuo naudotojo bus ištrinti iš jūsų kompiuterio. Tai "
-"neįtakos laiškų esančių serveryje."
+#~ msgid "Use _three pane view"
+#~ msgstr "Naudoti _trijų skydelių vaizdą"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Įjungti _kalbos tikrinimą"
+
+#~ msgid "Notifications"
+#~ msgstr "Pranešimai"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Groti pranešimų garsus"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Rodyti _pranešimus gavus naują laišką"
+
+#~ msgid "Always _watch for new mail"
+#~ msgstr "Rodyti _pranešimus gavus naują laišką"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr "Geary veiks fone ir praneš apie naujus laiškus"
+
+#~| msgid "_Preferences"
+#~ msgid "Preferences"
+#~ msgstr "Nustatymai"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Ar tikrai norite ištrintį šį "
+#~ "naudotoją?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Visi laiškai susiję su šiuo naudotojo bus ištrinti iš jūsų kompiuterio. Tai "
+#~ "neįtakos laiškų esančių serveryje."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Naudotojas:"
+#~ msgid "Nickname:"
+#~ msgstr "Naudotojas:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Pašto adresas:"
+#~ msgid "Email address:"
+#~ msgstr "Pašto adresas:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Vykdomas Geary atnaujinimas..."
+#~ msgid "Geary update in progress…"
+#~ msgstr "Vykdomas Geary atnaujinimas..."
 
 #~ msgid "Notify of new mail at start_up"
-#~ msgstr "Įjungiant pranešti apie naujus laiškus "
+#~ msgstr "Įjungiant pranešti apie naujus laiškus"
 
 #~ msgid "_Delete"
 #~ msgstr "_Ištrinti"
@@ -2172,7 +1913,6 @@ msgstr "Vykdomas Geary atnaujinimas..."
 #~ msgid "Please enter your password"
 #~ msgstr "Įveskite savo slaptažodį"
 
-#~| msgid "_Close"
 #~ msgid "C_lose"
 #~ msgstr "_Užverti"
 
diff --git a/po/ms.po b/po/ms.po
index 37d8014..8c83990 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -9,516 +9,508 @@ 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-29 01:38+0000\n"
-"Last-Translator: abuyop <abuyop gmail com>\n"
-"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/geary/";
-"language/ms_MY/)\n"
-"Language: ms_MY\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:08+0000\n"
+"Last-Translator: abuyop <Unknown>\n"
+"Language-Team: Malay (Malaysia) "
+"(http://www.transifex.com/projects/p/geary/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: ../../src/client/accounts/add-edit-page.vala:641
-msgid "        &#8226; Connection error.\n"
-msgstr "&#8226; Ralat sambungan.\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:55+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: ms_MY\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:624
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "&#8226; Alamat emel sudah ditambah ke Geary.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:628
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "&#8226; ralat sambungan IMAP.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:631
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "&#8226; nama pengguna atau kata laluan IMAP salah.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:621
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "&#8226; Gelaran akaun tidak sah.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:634
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "&#8226; Ralat sambungan SMTP.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "&#8226; Nama pengguna dan kata laluan SMTP salah\n"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Kotak Masuk"
 
-#: ../../src/client/accounts/add-edit-page.vala:645
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "&#8226; Nama pengguna dan kata laluan salah.\n"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Draf"
 
-#: ../../src/client/views/conversation-viewer.vala:1203
-msgid " (Invalid?)"
-msgstr "(Tidak sah?)"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Hantar Mel"
 
-#: ../../src/client/composer/composer-window.vala:972
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" sudah dilampir untuk penghantaran."
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Dibintang"
 
-#: ../../src/client/composer/composer-window.vala:937
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "\"%s\" tidak ditemui."
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Penting"
 
-#: ../../src/client/composer/composer-window.vala:965
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "\"%s\" tidak dapat dibua untuk pembacaan."
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Semua Mel"
 
-#: ../../src/client/composer/composer-window.vala:944
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" adalah folder."
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Spam"
 
-#: ../../src/client/composer/composer-window.vala:951
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" adalah fail kosong."
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Tong Sampah"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Kotak Keluar"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Gelintar"
 
-#. / 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 "%B %-e, %Y %-l:%M %P"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Arkib"
 
-#. / 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 "%B %-e, %Y %-l:%M %P"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Tiada"
 
-#. / 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"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr ""
 
-#. / 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, %b %-e, %Y at %-l:%M %p"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr ""
 
-#. / 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 "%b %-e"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] "%d mesej"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Mel Yahoo!"
 
-#: ../../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d mesej baru"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:43
-#, c-format
-msgid "%d results"
-msgstr "%d keputusan"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Lain-lain"
 
-#. / 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 belum dibaca"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr ""
 
-#: ../../src/client/util/util-date.vala:170
-#, c-format
-msgid "%dh ago"
-msgstr "%dj yang lalu"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr ""
 
-#: ../../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgstr "%dm yang lalu"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:222
-#, c-format
-msgid "%i matches"
-msgstr "%i padanan"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:224
-#, c-format
-msgid "%i matches (wrapped)"
-msgstr "%i padanan (dililit)"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr ""
 
-#. / 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"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr ""
 
-#. / 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"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:107
-#, 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 lain-lain mesej baru untuk %s)"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr ""
 
-#. / 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)"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(tiada subjek)"
 
-#: ../../src/client/views/conversation-web-view.vala:289
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - Pemeriksa Perbualan"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %b %-e, %Y at %-l:%M %p"
 
-#: ../../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Mesej Baru"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "Dalam %1$s, %2$s menulis:"
 
 #. / 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
+#: ../src/engine/rfc822/rfc822-utils.vala:228
 msgid "%s wrote:"
 msgstr "%s menulis:"
 
-#: ../../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 sejumlah mesej baru"
+#. / 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:234
+msgid "On %s:"
+msgstr "Pada %s:"
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Mesej dimajukan ----------"
 
-#: ../../src/client/views/conversation-viewer.vala:246
-#, c-format
-msgid "%u conversations selected."
-msgstr "%u perbualan dipilih."
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Daripada: %s\n"
 
-#: ../../src/client/views/conversation-viewer.vala:743
-#, c-format
-msgid "%u read messages"
-msgstr "%u mesej baru"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Subjek: %s\n"
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Tarikh: %s\n"
 
-#: ../../src/client/util/util-email.vala:30
-msgid "(no subject)"
-msgstr "(tiada subjek)"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Kepada: %s\n"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Mesej dimajukan ----------"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Sk: %s\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:211
-msgid "1 month back"
-msgstr "1 bulan kebelakang"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "tiada"
 
-#: ../../src/client/accounts/add-edit-page.vala:214
-msgid "1 year back"
-msgstr "1 tahun kebelakang"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Klien Mel"
 
-#: ../../src/client/accounts/add-edit-page.vala:210
-msgid "2 weeks back"
-msgstr "2 minggu kebelakang"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:212
-msgid "3 months back"
-msgstr "3 bulan kebelakang"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Lawati laman sesawang Yorba"
 
-#: ../../src/client/accounts/add-edit-page.vala:213
-msgid "6 months back"
-msgstr "6 bulan kebelakang"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
+#: ../src/client/application/geary-controller.vala:62
+msgid "Delete conversation (Shift+Delete)"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Anda pasti hendak membuang akaun ini?</"
-"span>"
 
-#: ../../ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">Tidak dapat buang akaun</span>"
+#: ../src/client/application/geary-controller.vala:63
+msgid "Delete conversations (Shift+Delete)"
+msgstr ""
 
-#: ../../ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr ""
-"Tetingkap penggubah yang berkaitan dengan akaun ini kini dibuka. Hantar atau "
-"singkir mesej dan cuba lagi."
 
-#: ../../src/client/geary-controller.vala:1491
-#, c-format
-msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr "Satu fail bernama \"%s\" sudah wujud. Anda hendak gantikannya?"
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:245
-msgid "A_ccounts"
-msgstr "A_kaun"
+#: ../src/client/application/geary-controller.vala:72
+msgid "_Archive"
+msgstr "_Arkib"
 
-#: ../../src/client/geary-controller.vala:1227
-#, c-format
-msgid "About %s"
-msgstr "Perihal %s"
+#: ../src/client/application/geary-controller.vala:73
+msgid "Archive conversation (A)"
+msgstr ""
 
-#: ../../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Akaun"
+#: ../src/client/application/geary-controller.vala:74
+msgid "Archive conversations (A)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:77
+msgid "Mark as S_pam"
+msgstr "Tanda sebagai S_pam"
 
-#: ../../ui/account_list.glade:71
-msgid "Add account"
-msgstr "Tambah akaun"
+#: ../src/client/application/geary-controller.vala:78
+msgid "Mark as not S_pam"
+msgstr "Tanda sebagai bukan S_pam"
 
-#: ../../src/client/geary-controller.vala:304
-msgid "Add label"
-msgstr "Tambah label"
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
+msgid "Mark conversation"
+msgstr "Tanda perbualan"
+
+#: ../src/client/application/geary-controller.vala:81
+msgid "Mark conversations"
+msgstr "Tanda perbualan"
 
-#: ../../src/client/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Tambal label ke perbualan"
 
-#: ../../src/client/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Tambah label ke perbualan"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Semua Mel"
-
-#: ../../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 ""
-"Semua emel yang berkaitan dengan akaun ini akan dibuang dari komputer anda. "
-"Ia tidak memberi kesan pada emel yang ada didalam pelayan."
-
-#: ../../src/client/geary-args.vala:24
-msgid "Allow inspection of WebView"
-msgstr "Benarkan pemeriksaan Paparan Sesawang"
-
-#: ../../src/client/views/conversation-viewer.vala:509
-msgid "Always Show From Sender"
-msgstr "Sentiasa Tunjuk Dari Pengirim"
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
+msgid "Move conversation"
+msgstr "Alih perbualan"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Arkib"
+#: ../src/client/application/geary-controller.vala:85
+msgid "Move conversations"
+msgstr "Alih perbualan"
 
-#: ../../src/client/geary-controller.vala:48
-msgid "Archive conversation (Delete, Backspace, A)"
-msgstr "Arkibkan perbualan (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:372
+msgid "A_ccounts"
+msgstr "A_kaun"
 
-#: ../../src/client/geary-controller.vala:49
-msgid "Archive conversations (Delete, Backspace, A)"
-msgstr "Arkib perbualan (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:377
+#: ../src/client/components/stock.vala:27
+msgid "_Preferences"
+msgstr "_Keutamaan"
 
-#: ../../src/client/geary-controller.vala:1477
-#, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr "Anda pasti ingin buka \"%s\"?"
+#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/components/stock.vala:25
+msgid "_Help"
+msgstr "Ba_ntuan"
 
-#: ../../src/client/geary-controller.vala:1478
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
-msgstr ""
-"Lampiran boleh merosakkan sistem anda jika dibuka. Hanya buka fail dari "
-"sumber yang dipercayai."
+#: ../src/client/application/geary-controller.vala:385
+#: ../src/client/components/stock.vala:21
+msgid "_About"
+msgstr "Perih_al"
 
-#: ../../src/client/views/conversation-viewer.vala:614
-msgid "Bcc:"
-msgstr "Ss:"
+#: ../src/client/application/geary-controller.vala:389
+#: ../src/client/components/stock.vala:29
+msgid "_Quit"
+msgstr "K_eluar"
 
-#: ../../ui/composer.glade:113
-msgid "Bold (Ctrl+B)"
-msgstr "Tebal (Ctrl+B)"
+#: ../src/client/application/geary-controller.vala:394
+msgid "_Mark as..."
+msgstr "_Tanda sebagai..."
 
-#: ../../ui/composer.glade:69
-msgid "C_olor"
-msgstr "_Warna"
+#: ../src/client/application/geary-controller.vala:400
+msgid "Mark as _Read"
+msgstr "Tanda sebagai _Dibaca"
 
-#: ../../src/client/composer/composer-window.vala:926
-msgid "Cannot add attachment"
-msgstr "Tidak dapat tambah lampiran"
+#: ../src/client/application/geary-controller.vala:406
+msgid "Mark as _Unread"
+msgstr "Tanda sebagai _Belum Baca"
 
-#: ../../src/client/views/conversation-viewer.vala:611
-msgid "Cc:"
-msgstr "Sk:"
+#: ../src/client/application/geary-controller.vala:412
+msgid "_Star"
+msgstr "B_intang"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Sk: %s\n"
+#: ../src/client/application/geary-controller.vala:417
+msgid "U_nstar"
+msgstr "N_yahbintang"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Pilih satu fail"
+#: ../src/client/application/geary-controller.vala:427
+msgid "Add label"
+msgstr "Tambah label"
 
-#: ../../src/client/geary-controller.vala:553
-msgid "Co_ntinue"
-msgstr "T_eruskan"
+#: ../src/client/application/geary-controller.vala:428
+msgid "_Label"
+msgstr "_Label"
 
-#: ../../src/client/geary-application.vala:29
-msgid "Compose Message"
-msgstr "Gubah Mesej"
+#: ../src/client/application/geary-controller.vala:432
+msgid "_Move"
+msgstr "A_lih"
 
-#: ../../src/client/geary-controller.vala:313
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Gubah mesej baru (Ctrl+N, N)"
 
-#: ../../ui/preferences.glade:117
-msgid "Composer"
-msgstr "Penggubah"
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
+msgid "_Reply"
+msgstr "_Balas"
 
-#: ../../src/client/views/conversation-viewer.vala:897
-msgid "Copy _Email Address"
-msgstr "Salin Alamat _Emel"
+#: ../src/client/application/geary-controller.vala:441
+msgid "Reply (Ctrl+R, R)"
+msgstr "Balas (Ctrl+R, R)"
 
-#: ../../src/client/views/conversation-viewer.vala:902
-msgid "Copy _Link"
-msgstr "Salin _Pautan"
+#: ../src/client/application/geary-controller.vala:445
+msgid "R_eply All"
+msgstr "Ba_las Semua"
 
-#: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr "Hakcipta 2011-2013 Yayasan Yorba"
+#: ../src/client/application/geary-controller.vala:446
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+msgstr "Balas semua (Ctrl+Shift+R, Shift+R)"
 
-#: ../../ui/composer.glade:21
-msgid "Cu_t"
-msgstr "P_otong"
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
+msgid "_Forward"
+msgstr "_Maju"
 
-#: ../../src/client/views/conversation-viewer.vala:620
-msgid "Date:"
-msgstr "Tarikh:"
+#: ../src/client/application/geary-controller.vala:452
+msgid "Forward (Ctrl+L, F)"
+msgstr "Maju (Ctrl+L, F)"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "Tarikh: %s\n"
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:43
-msgid "Delete conversation (Delete, Backspace, A)"
-msgstr "Padam perbualan (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:44
-msgid "Delete conversations (Delete, Backspace, A)"
-msgstr "Padam perbualan (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:25
-msgid "Display program version"
-msgstr "Papar versi program"
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:663
-msgid "Do you want to discard the unsaved message?"
-msgstr "Anda mahu singkirkan mesej belum disimpan?"
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:666
-msgid "Do you want to discard this message?"
-msgstr "Anda hendak singkir mesej ini?"
+#: ../src/client/application/geary-controller.vala:746
+msgid "Unable to store server trust exception"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:1479
-msgid "Don't _ask me again"
-msgstr "Jangan t_anya saya lagi"
+#: ../src/client/application/geary-controller.vala:983
+msgid "Your settings are insecure"
+msgstr "Tetapan anda tidak selamat"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Draf"
+#: ../src/client/application/geary-controller.vala:984
+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 ""
+"Tetapan IMAP dan/atau SMTP anda tidak nyatakan SSL atau TLS. Ini bermakna "
+"nama pengguna dan kata laluan anda dapat dibaca oleh individu lain didalam "
+"rangkaian. Anda pasti hendak membuatnya?"
 
-#: ../../ui/composer.glade:419
-msgid "Drop files here"
-msgstr "Lepaskan fail disini"
+#: ../src/client/application/geary-controller.vala:985
+msgid "Co_ntinue"
+msgstr "T_eruskan"
 
-#: ../../ui/login.glade:115
-msgid "E_mail address:"
-msgstr "Alamat e_mel:"
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/components/status-bar.vala:29
+msgid "Error sending email"
+msgstr "Ralat menghantar emel"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "E_xit"
-msgstr "Ke_luar"
+#: ../src/client/application/geary-controller.vala:1064
+msgid ""
+"Geary encountered an error sending an email.  If the problem persists, "
+"please manually delete the email from your Outbox folder."
+msgstr ""
+"Geary menghadapi ralat semasa menghantar emel. Jika masalah berlanjutan, "
+"sila padam emel secara manual dari folder Kotak Keluar anda."
 
-#: ../../src/client/views/conversation-viewer.vala:533
-msgid "Edit Draft"
-msgstr "Sunting Draf"
+#: ../src/client/application/geary-controller.vala:1068
+#: ../src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
+msgstr ""
 
-#: ../../ui/account_list.glade:84
-msgid "Edit account"
-msgstr "Sunting akaun"
+#: ../src/client/application/geary-controller.vala:1069
+msgid ""
+"Geary encountered an error saving a sent message to Sent Mail.  The message "
+"will stay in your Outbox folder until you delete it."
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:94
-msgid "Email address:"
-msgstr "Alamat emel:"
+#: ../src/client/application/geary-controller.vala:1138
+msgid "Labels"
+msgstr "Label"
 
-#: ../../src/client/geary-application.vala:28
-msgid "Email;E-mail;Mail;"
-msgstr "Emel;E-mel;Mel;"
+#: ../src/client/application/geary-controller.vala:1150
+msgid "Unable to open the database for %s"
+msgstr "Tidak boleh buka pangkalan data untuk %s"
 
-#: ../../ui/preferences.glade:131
-msgid "Enable _spell checking"
-msgstr "Benarkan penyemak _ejaan"
+#: ../src/client/application/geary-controller.vala:1151
+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 ""
+"Terdapat ralat membuka pangkalan data mel setempat untuk akaun ini. Ia "
+"berkemungkinan disebabkan kerosakan fail pangkalan data dalam direktori "
+"ini:\n"
+"\n"
+"%s\n"
+"\n"
+"Geary dapat membina semula pangkalan data dan segerak-semula dengan pelayan "
+"atau keluar.\n"
+"\n"
+"Membina semula pangkalan data akan memusnahkan semua emel setempat dan "
+"lampirannya. <b>Mel dalam pelayan anda tidak terlibat.</b>"
 
-#: ../../ui/login.glade:588
-msgid "Encr_yption:"
-msgstr "Pen_yulitan:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "_Rebuild"
+msgstr "B_ina Semula"
 
-#: ../../ui/login.glade:607
-msgid "Encrypt_ion:"
-msgstr "Peny_ulitan:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "E_xit"
+msgstr "Ke_luar"
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-msgid "Enter your account information to get started."
-msgstr "Masukkan maklumat akaun anda untuk mulakan."
+#: ../src/client/application/geary-controller.vala:1162
+msgid "Unable to rebuild database for \"%s\""
+msgstr "Tidak boleh bina semula pangkalan data untuk \"%s\""
 
-#: ../../src/client/geary-controller.vala:714
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -528,1015 +520,1254 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../src/client/composer/composer-window.vala:43
-msgid "Error saving"
-msgstr "Ralat menyimpan"
-
-#. / 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 "Ralat menghantar emel"
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
+msgid "Unable to open local mailbox for %s"
+msgstr "Tidak boleh buka kotak mel setempat untuk %s"
 
-#: ../../src/client/accounts/add-edit-page.vala:216
-msgid "Everything"
-msgstr "Segalanya"
+#: ../src/client/application/geary-controller.vala:1186
+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 ""
+"Terdapat ralat membuka pangkalan data mel  setempat untuk akaun ini. Ia "
+"berkemungkinan masalah keizinan fail.\n"
+"\n"
+"Sila semak sama ada anda mempunyai keizinan baca/tulis untuk semua fail "
+"dalam direktori ini:\n"
+"\n"
+"%s"
 
-#: ../../src/client/views/conversation-viewer.vala:1897
-msgid "Failed to open default text editor."
-msgstr "Gagal membuka penyunting teks lalai."
+#: ../src/client/application/geary-controller.vala:1196
+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 ""
+"Nombor versi bagi pangkalan data mel setempat diformat untuk versi lebih "
+"baharu Geary. Malangnya, pangkalan data tidak dapat di\"kembalikan\" untuk "
+"dijalankan dengan versi Geary ini.\n"
+"\n"
+"Sila pasang versi terkini Geary dan cuba lagi."
 
-#: ../../src/client/geary-args.vala:54
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Gagal menghurai pilihan baris perintah: %s\n"
+#: ../src/client/application/geary-controller.vala:1207
+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 ""
+"Terdapat ralat membuka akaun setempat. Ia berkemungkinan isu kesambungan.\n"
+"\n"
+"Sila semak sambungan rangkaian anda dan mula semula Geary."
 
-#. / 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 "Terakhir Dahulu"
+#: ../src/client/application/geary-controller.vala:1715
+msgid "About %s"
+msgstr "Perihal %s"
 
-#: ../../ui/composer.glade:182
-msgid "Fixed Width"
-msgstr "Lebar Tetap"
+#. / 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-controller.vala:1718
+msgid "translator-credits"
+msgstr ""
+"Abuyop <abuyop gmail com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  abuyop https://launchpad.net/~abuyop";
 
-#: ../../src/client/geary-controller.vala:329
-msgid "Forward (Ctrl+L, F)"
-msgstr "Maju (Ctrl+L, F)"
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:605
-msgid "From:"
-msgstr "Daripada:"
+#: ../src/client/application/geary-controller.vala:1986
+msgid "Are you sure you want to open \"%s\"?"
+msgstr "Anda pasti ingin buka \"%s\"?"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "Daripada: %s\n"
+#: ../src/client/application/geary-controller.vala:1987
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
+"Lampiran boleh merosakkan sistem anda jika dibuka. Hanya buka fail dari "
+"sumber yang dipercayai."
 
-#: ../../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#: ../src/client/application/geary-controller.vala:1988
+msgid "Don't _ask me again"
+msgstr "Jangan t_anya saya lagi"
 
-#: ../../src/client/geary-application.vala:25
-msgid "Geary Mail"
-msgstr "Mel Geary"
+#: ../src/client/application/geary-controller.vala:2006
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr "Satu fail bernama \"%s\" sudah wujud. Anda hendak gantikannya?"
 
-#: ../../src/client/geary-controller.vala:626
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
-"Geary menghadapi ralat semasa menghantar emel. Jika masalah berlanjutan, "
-"sila padam emel secara manual dari folder Kotak Keluar anda."
+"Fail sudah wujud dalam \"%s\". Menggantikannya akan tulis-ganti kandungannya."
 
-#: ../../ui/password-dialog.glade:315
-msgid "General"
-msgstr "Am"
+#: ../src/client/application/geary-controller.vala:2011
+msgid "_Replace"
+msgstr "_Ganti"
 
-#: ../../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/client/application/geary-controller.vala:2309
+msgid "Close open draft messages?"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:133
-msgid "IMAP Credentials"
-msgstr "Kelayakan IMAP"
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
 
-#: ../../ui/login.glade:572
-msgid "IMAP password"
-msgstr "Kata laluan IMAP"
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
 
-#: ../../ui/login.glade:286 ../../ui/password-dialog.glade:334
-msgid "IMAP settings"
-msgstr "Tetapan IMAP:"
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
+msgstr ""
 
-#: ../../ui/login.glade:556
-msgid "IMAP username"
-msgstr "Nama pengguna IMAP"
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Penting"
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Kotak Masuk"
+#: ../src/client/application/geary-controller.vala:2489
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Kotak Masuk"
+#: ../src/client/application/geary-controller.vala:2491
+msgid "Delete"
+msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:163
-#, c-format
-msgid "Indexing %s account"
-msgstr "Mengindeks %s akaun"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
+msgstr ""
 
-#: ../../ui/composer.glade:120
-msgid "Italic (Ctrl+I)"
-msgstr "Condong (Ctrl+I)"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:689
-msgid "Labels"
-msgstr "Label"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr ""
 
-#: ../../ui/composer.glade:151
-msgid "Lar_ge"
-msgstr "Be_sar"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Outputkan maklumat penyahpepijatan"
 
-#: ../../ui/composer.glade:152
-msgid "Large"
-msgstr "Besar"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Log pemantauan perbualan"
 
-#: ../../ui/composer.glade:62
-msgid "Link (Ctrl+L)"
-msgstr "Paut (Ctrl+L)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Log penyahsirian rangkaian"
+
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Log aktiviti rangkaian"
 
 #. / 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
+#: ../src/client/application/geary-args.vala:17
 msgid "Log IMAP replay queue"
 msgstr "Log baris gilir main semula IMAP"
 
-#: ../../src/client/geary-args.vala:11
-msgid "Log conversation monitoring"
-msgstr "Log pemantauan perbualan"
+#. / 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 penyirian rangkaian"
 
-#: ../../src/client/geary-args.vala:21
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Log aktiviti berkala"
+
+#: ../src/client/application/geary-args.vala:22
 msgid "Log database queries (generates lots of messages)"
 msgstr "Log permintaan pangkalan data (jana banyak mesej)"
 
 #. / "Normalization" can also be called "synchronization"
-#: ../../src/client/geary-args.vala:23
+#: ../src/client/application/geary-args.vala:24
 msgid "Log folder normalization"
 msgstr "Log penormalan folder"
 
-#: ../../src/client/geary-args.vala:13
-msgid "Log network activity"
-msgstr "Log aktiviti rangkaian"
-
-#: ../../src/client/geary-args.vala:12
-msgid "Log network deserialization"
-msgstr "Log penyahsirian rangkaian"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Benarkan pemeriksaan Paparan Sesawang"
 
-#. / 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 penyirian rangkaian"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:20
-msgid "Log periodic activity"
-msgstr "Log aktiviti berkala"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Papar versi program"
 
-#: ../../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr ""
 
-#: ../../src/client/geary-application.vala:26
-msgid "Mail Client"
-msgstr "Klien Mel"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Sila laporkan ulasan, cadangan dan pepijat ke:"
 
-#: ../../src/client/views/conversation-viewer.vala:1479
-msgid "Mark Unread From _Here"
-msgstr "Tanda Belum Dibaca Dari _Sini"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Gagal menghurai pilihan baris perintah: %s\n"
 
-#: ../../src/client/geary-controller.vala:52
-msgid "Mark as S_pam"
-msgstr "Tanda sebagai S_pam"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Pilihan baris perintah \"%s\" tidak dikenali\n"
 
-#: ../../src/client/geary-controller.vala:277
-msgid "Mark as _Read"
-msgstr "Tanda sebagai _Dibaca"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Mesej Baru"
 
-#: ../../src/client/geary-controller.vala:283
-msgid "Mark as _Unread"
-msgstr "Tanda sebagai _Belum Baca"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d mesej baru"
 
-#: ../../src/client/geary-controller.vala:53
-msgid "Mark as not S_pam"
-msgstr "Tanda sebagai bukan S_pam"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s,%d sejumlah mesej baru"
 
-#: ../../src/client/geary-controller.vala:55
-#: ../../src/client/geary-controller.vala:269
-msgid "Mark conversation"
-msgstr "Tanda perbualan"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d lain-lain mesej baru untuk %s)"
 
-#: ../../src/client/geary-controller.vala:56
-msgid "Mark conversations"
-msgstr "Tanda perbualan"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Buka"
 
-#: ../../src/client/views/formatted-conversation-data.vala:11
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Saya"
 
-#: ../../ui/composer.glade:158
-msgid "Medium"
-msgstr "Medium"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr ""
 
-#: ../../ui/composer.glade:75
-msgid "More options"
-msgstr "Lagi pilihan"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:59
-#: ../../src/client/geary-controller.vala:308
-msgid "Move conversation"
-msgstr "Alih perbualan"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:60
-msgid "Move conversations"
-msgstr "Alih perbualan"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
 
-#: ../../ui/login.glade:176
-msgid "N_ame:"
-msgstr "N_ama:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr ""
 
-#: ../../ui/login.glade:230
-msgid "N_ickname:"
-msgstr "_Gelaran:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "Mesej Baru"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
 
-#: ../../ui/remove_confirm.glade:80
-msgid "Nickname:"
-msgstr "Gelaran:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
 
-#: ../../ui/login.glade:661
-msgid "No authentication re_quired"
-msgstr "Tiada pengesahihan di_perlukan"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:275
-msgid "No conversations in folder."
-msgstr "Tiada perbualan didalam folder."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:244
-msgid "No conversations selected."
-msgstr "Tiada perbualan dipilih."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:273
-msgid "No search results found."
-msgstr "Tiada keputusan gelintar ditemui."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:128
-#: ../../src/engine/api/geary-special-folder-type.vala:58
-msgid "None"
-msgstr "Tiada"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr ""
+
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr ""
+
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Pilih satu fail"
+
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "L_ampir"
+
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr ""
+
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Akaun"
+
+#. / 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 "Terakhir Dahulu"
+
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Selamat datang ke Geary."
+
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Masukkan maklumat akaun anda untuk mulakan."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 minggu kebelakang"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 bulan kebelakang"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 bulan kebelakang"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 bulan kebelakang"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 tahun kebelakang"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Segalanya"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "In_gat kata laluan"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "Inga_t kata laluan"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Tidak boleh sahkan:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Gelaran akaun tidak sah.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Alamat emel sudah ditambah ke Geary.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; ralat sambungan IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; nama pengguna atau kata laluan IMAP salah.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Ralat sambungan SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; Nama pengguna dan kata laluan SMTP salah\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Ralat sambungan.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Nama pengguna dan kata laluan salah.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Simpan"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "T_ambah"
+
+#. / 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"
 
-#: ../../ui/preferences.glade:158
-msgid "Notifications"
-msgstr "Pemberitahuan"
+#. / 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 "%l:%M %P"
 
-#: ../../src/client/util/util-date.vala:164
+#. / 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 "%b %-e"
+
+#. / 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 "%B %-e, %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 "%B %-e, %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 "%B %-e, %Y %-l:%M %P"
+
+#: ../src/client/util/util-date.vala:164
 msgid "Now"
 msgstr "Sekarang"
 
-#. / 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 "Dalam %1$s, %2$s menulis:"
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#. / 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 "Pada %s:"
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Buka"
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Semalam"
 
-#: ../../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Lain-lain"
+#. / 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
+msgid "%A"
+msgstr "%A"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Kotak Keluar"
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "bait"
 
-#: ../../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "TB"
 
-#: ../../src/client/geary-args.vala:10
-msgid "Output debugging information"
-msgstr "Outputkan maklumat penyahpepijatan"
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "GB"
 
-#: ../../ui/login.glade:337
-msgid "P_ort:"
-msgstr "P_ort:"
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "MB"
 
-#: ../../ui/login.glade:474
-msgid "Pass_word:"
-msgstr "Ka_ta Laluan:"
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "KB"
 
-#: ../../ui/login.glade:101
-msgid "Password"
-msgstr "Kata Laluan"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d mesej"
 
-#: ../../ui/password-dialog.glade:196
-msgid "Password:"
-msgstr "Kata laluan:"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d belum dibaca"
 
-#: ../../ui/composer.glade:102
-msgid "Paste _With Formatting"
-msgstr "Tampal _Dengan Pemformatan"
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your email password"
-msgstr "Sila masukkan kata laluan emel anda"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Kotak Masuk"
 
-#: ../../src/client/geary-args.vala:47
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Sila laporkan ulasan, cadangan dan pepijat ke:"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Gelintar %s akaun"
 
-#: ../../ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
-msgstr "Sila tunggu semasa Geary mengesahkan akaun anda."
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:421
-msgid "Por_t:"
-msgstr "Po_rt:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "Tiada perbualan dipilih."
 
-#: ../../ui/password-dialog.glade:367 ../../ui/password-dialog.glade:470
-msgid "Port:"
-msgstr "Port:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:81
-msgid "Quote text  (Ctrl+])"
-msgstr "Petik teks (Ctrl+])"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
+msgstr "Tiada keputusan gelintar ditemui."
 
-#: ../../src/client/geary-controller.vala:322
-msgid "R_eply All"
-msgstr "Ba_las Semua"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
+msgstr "Tiada perbualan didalam folder."
 
-#: ../../ui/preferences.glade:55
-msgid "Reading"
-msgstr "Pembacaan"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
+msgstr "Mesej ini mengandungi imej jauh."
 
-#: ../../ui/password-dialog.glade:274
-msgid "Real name:"
-msgstr "Nama sebenar:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr "Tunjuk Imej"
 
-#: ../../src/client/accounts/add-edit-page.vala:590
-msgid "Remem_ber password"
-msgstr "Inga_t kata laluan"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
+msgstr "Sentiasa Tunjuk Dari Pengirim"
 
-#: ../../src/client/accounts/add-edit-page.vala:583
-msgid "Remem_ber passwords"
-msgstr "In_gat kata laluan"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
+msgstr "Sunting Draf"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "Daripada:"
 
-#: ../../ui/account_list.glade:97
-msgid "Remove account"
-msgstr "Buang akaun"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "Kepada:"
 
-#: ../../ui/composer.glade:95
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Buang pemformatan (Ctrl+Space)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Sk:"
 
-#: ../../src/client/geary-controller.vala:318
-msgid "Reply (Ctrl+R, R)"
-msgstr "Balas (Ctrl+R, R)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Ss:"
 
-#: ../../src/client/geary-controller.vala:323
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
-msgstr "Balas semua (Ctrl+Shift+R, Shift+R)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "Subjek:"
 
-#: ../../src/client/views/conversation-viewer.vala:1452
-msgid "Reply to _All"
-msgstr "Balas kepada Semu_a"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Tarikh:"
 
-#: ../../ui/password-dialog.glade:163
-msgid "SMTP Credentials"
-msgstr "Kelayakan SMTP"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:507
-msgid "SMTP password"
-msgstr "Kata laluan SMTP"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
+msgstr ""
 
-#: ../../ui/login.glade:439 ../../ui/password-dialog.glade:437
-msgid "SMTP settings"
-msgstr "Tetapan SMTP"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "_Salin"
 
-#: ../../ui/login.glade:491
-msgid "SMTP username"
-msgstr "Nama pengguna SMTP"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "Salin Alamat _Emel"
 
-#: ../../src/client/dialogs/password-dialog.vala:124
-msgid "SSL"
-msgstr "SSL"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "Salin _Pautan"
 
-#: ../../ui/password-dialog.glade:382 ../../ui/password-dialog.glade:485
-msgid "SSL/TLS encryption:"
-msgstr "Penyulitan SSL/TLS:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
+msgstr "Pilih _Mesej"
 
-#: ../../src/client/dialogs/password-dialog.vala:126
-msgid "STARTTLS"
-msgstr "STARTLS"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Pilih Semu_a"
 
-#: ../../ui/composer.glade:169
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "Per_iksa"
 
-#: ../../ui/composer.glade:175
-msgid "S_erif"
-msgstr "S_erif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr "Pautan ini kelihatan pergi ke"
 
-#: ../../ui/login.glade:160
-msgid "S_ervice:"
-msgstr "P_erkhidmatan:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
+msgstr "tetapi pergi ke"
 
-#: ../../ui/composer.glade:170
-msgid "Sans Serif"
-msgstr "Sans Serif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
+msgstr " (Tidak sah?)"
 
-#: ../../src/client/views/conversation-viewer.vala:1437
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
+msgstr "_Simpan Imej Sebagai..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_Simpan Sebagai..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "Simpan Semua La_mpiran..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
 msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] "Simpan Semula _Lampiran..."
 
-#: ../../src/client/views/conversation-viewer.vala:1400
-msgid "Save All A_ttachments..."
-msgstr "Simpan Semua La_mpiran..."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "Balas kepada Semu_a"
 
-#: ../../src/client/composer/composer-window.vala:41
-msgid "Saved"
-msgstr "Disimpan"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "_Tanda sebagai Dibaca"
 
-#: ../../src/client/composer/composer-window.vala:42
-msgid "Saving"
-msgstr "Menyimpan"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "_Tanda sebagai Belum Baca"
 
-#: ../../ui/login.glade:304
-msgid "Se_rver:"
-msgstr "Pela_yan:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
+msgstr "Tanda Belum Dibaca Dari _Sini"
 
-#: ../../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 "Gelintar"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "_Lihat Sumber"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:39
-#: ../../src/client/ui/main-toolbar.vala:170
-#, c-format
-msgid "Search %s account"
-msgstr "Gelintar %s akaun"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "Gagal membuka penyunting teks lalai."
 
-#: ../../src/client/ui/main-toolbar.vala:76
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Gelintar semua mel dalam akaun untuk kata kunci (Ctrl+S)"
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr "%s - Pemeriksa Perbualan"
 
-#: ../../src/client/composer/composer-window.vala:1243
-msgid "Select Color"
-msgstr "Pilih Warna"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Disimpan"
 
-#: ../../src/client/ui/stock.vala:32
-#: ../../src/client/views/conversation-viewer.vala:916
-msgid "Select _All"
-msgstr "Pilih Semu_a"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Menyimpan"
 
-#: ../../src/client/views/conversation-viewer.vala:910
-msgid "Select _Message"
-msgstr "Pilih _Mesej"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Ralat menyimpan"
 
-#: ../../src/client/geary-application.vala:27
-msgid "Send and receive email"
-msgstr "Hantar dan terima emel"
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:747
-msgid "Send message with an empty body?"
-msgstr "Hantar mesej dengan badan kosong?"
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Mesej Baru"
+
+#: ../src/client/composer/composer-widget.vala:138
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Anda hendak singkir mesej ini?"
 
-#: ../../src/client/composer/composer-window.vala:743
+#: ../src/client/composer/composer-widget.vala:1262
 msgid "Send message with an empty subject and body?"
 msgstr "Hantar mesej dengan subjek dan badan kosong?"
 
-#: ../../src/client/composer/composer-window.vala:745
+#: ../src/client/composer/composer-widget.vala:1264
 msgid "Send message with an empty subject?"
 msgstr "Hantar mesej dengan subjek kosong?"
 
-#: ../../src/client/composer/composer-window.vala:749
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Hantar mesej dengan badan kosong?"
+
+#: ../src/client/composer/composer-widget.vala:1268
 msgid "Send message without an attachment?"
 msgstr "Hantar mesej tanpa lampiran?"
 
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Tidak dapat tambah lampiran"
+
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "\"%s\" tidak ditemui."
+
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" adalah folder."
+
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" adalah fail kosong."
+
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "\"%s\" tidak dapat dibua untuk pembacaan."
+
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "\"%s\" sudah dilampir untuk penghantaran."
+
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Pilih Warna"
+
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr ""
+
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr ""
+
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../../src/client/ui/status-bar.vala:25
+#: ../src/client/components/status-bar.vala:26
 msgid "Sending..."
 msgstr "Menghantar..."
 
-#: ../../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Hantar Mel"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:404
-msgid "Ser_ver:"
-msgstr "Pe_layan:"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:176
-msgid "Serif"
-msgstr "Serif"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "tidak ditemui"
 
-#: ../../ui/password-dialog.glade:352 ../../ui/password-dialog.glade:455
-msgid "Server:"
-msgstr "Pelayan:"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_OK"
 
-#: ../../ui/password-dialog.glade:259
-msgid "Service:"
-msgstr "Perkhidmatan:"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Batal"
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "Show Images"
-msgstr "Tunjuk Imej"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Tutup"
 
-#: ../../ui/preferences.glade:193
-msgid "Show _notifications for new mail"
-msgstr "Tunjuk pe_mberitahuan bagi mel baru"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Singkir"
 
-#: ../../ui/composer.glade:164
-msgid "Small"
-msgstr "Kecil"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Buka"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Spam"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Cetak"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Dibintang"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Buang"
 
-#: ../../ui/login.glade:761
-msgid "Storage"
-msgstr "Storan"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Kekalkan"
 
-#: ../../ui/composer.glade:134
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Corer Tembus (Ctrl+K)"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Gelintar semua mel dalam akaun untuk kata kunci (Ctrl+S)"
 
-#: ../../src/client/views/conversation-viewer.vala:617
-msgid "Subject:"
-msgstr "Subjek:"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Mengindeks %s akaun"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Subjek: %s\n"
+#~ msgid "%d results"
+#~ msgstr "%d keputusan"
 
-#: ../../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#~ msgid "%i matches"
+#~ msgstr "%i padanan"
 
-#: ../../src/client/geary-controller.vala:1493
-#, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr ""
-"Fail sudah wujud dalam \"%s\". Menggantikannya akan tulis-ganti kandungannya."
+#~ msgid "%i matches (wrapped)"
+#~ msgstr "%i padanan (dililit)"
 
-#: ../../src/client/geary-controller.vala:747
-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 ""
-"Nombor versi bagi pangkalan data mel setempat diformat untuk versi lebih "
-"baharu Geary. Malangnya, pangkalan data tidak dapat di\"kembalikan\" untuk "
-"dijalankan dengan versi Geary ini.\n"
-"\n"
-"Sila pasang versi terkini Geary dan cuba lagi."
+#~ msgid "%u conversations selected."
+#~ msgstr "%u perbualan dipilih."
 
-#: ../../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 ""
-"Terdapat ralat membuka akaun setempat. Ia berkemungkinan isu kesambungan.\n"
-"\n"
-"Sila semak sambungan rangkaian anda dan mula semula Geary."
+#~ msgid "%u read messages"
+#~ msgstr "%u mesej baru"
 
-#: ../../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 ""
-"Terdapat ralat membuka pangkalan data mel  setempat untuk akaun ini. Ia "
-"berkemungkinan masalah keizinan fail.\n"
-"\n"
-"Sila semak sama ada anda mempunyai keizinan baca/tulis untuk semua fail "
-"dalam direktori ini:\n"
-"\n"
-"%s"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Anda pasti hendak membuang akaun "
+#~ "ini?</span> "
 
-#: ../../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 ""
-"Terdapat ralat membuka pangkalan data mel setempat untuk akaun ini. Ia "
-"berkemungkinan disebabkan kerosakan fail pangkalan data dalam direktori "
-"ini:\n"
-"\n"
-"%s\n"
-"\n"
-"Geary dapat membina semula pangkalan data dan segerak-semula dengan pelayan "
-"atau keluar.\n"
-"\n"
-"Membina semula pangkalan data akan memusnahkan semua emel setempat dan "
-"lampirannya. <b>Mel dalam pelayan anda tidak terlibat.</b>"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Tidak dapat buang akaun</span> "
 
-#: ../../src/client/views/conversation-viewer.vala:1147
-msgid "This link appears to go to"
-msgstr "Pautan ini kelihatan pergi ke"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Tetingkap penggubah yang berkaitan dengan akaun ini kini dibuka. Hantar atau "
+#~ "singkir mesej dan cuba lagi."
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "This message contains remote images."
-msgstr "Mesej ini mengandungi imej jauh."
+#~ msgid "Add account"
+#~ msgstr "Tambah akaun"
 
-#: ../../ui/composer.glade:435
-msgid "To add them as attachments"
-msgstr "Untuk menambah ia sebagai lampiran"
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Semua emel yang berkaitan dengan akaun ini akan dibuang dari komputer anda. "
+#~ "Ia tidak memberi kesan pada emel yang ada didalam pelayan."
 
-#: ../../src/client/views/conversation-viewer.vala:608
-msgid "To:"
-msgstr "Kepada:"
+#~ msgid "Archive conversation (Delete, Backspace, A)"
+#~ msgstr "Arkibkan perbualan (Delete, Backspace, A)"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "Kepada: %s\n"
+#~ msgid "Archive conversations (Delete, Backspace, A)"
+#~ msgstr "Arkib perbualan (Delete, Backspace, A)"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Tong Sampah"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Tebal (Ctrl+B)"
 
-#: ../../src/client/geary-controller.vala:294
-msgid "U_nstar"
-msgstr "N_yahbintang"
+#~ msgid "C_olor"
+#~ msgstr "_Warna"
 
-#: ../../src/client/dialogs/password-dialog.vala:17
-msgid "Unable to login to email server"
-msgstr "Tidak boleh daftar masuk ke pelayan emel"
+#~ msgid "Compose Message"
+#~ msgstr "Gubah Mesej"
 
-#: ../../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 "Tidak boleh buka kotak mel setempat untuk %s"
+#~ msgid "Composer"
+#~ msgstr "Penggubah"
 
-#: ../../src/client/geary-controller.vala:701
-#, c-format
-msgid "Unable to open the database for %s"
-msgstr "Tidak boleh buka pangkalan data untuk %s"
+#~ msgid "Copyright 2011-2013 Yorba Foundation"
+#~ msgstr "Hakcipta 2011-2013 Yayasan Yorba"
 
-#: ../../src/client/geary-controller.vala:713
-#, c-format
-msgid "Unable to rebuild database for \"%s\""
-msgstr "Tidak boleh bina semula pangkalan data untuk \"%s\""
+#~ msgid "Cu_t"
+#~ msgstr "P_otong"
 
-#: ../../src/client/accounts/add-edit-page.vala:619
-msgid "Unable to validate:\n"
-msgstr "Tidak boleh sahkan:\n"
+#~ msgid "Delete conversation (Delete, Backspace, A)"
+#~ msgstr "Padam perbualan (Delete, Backspace, A)"
 
-#: ../../ui/composer.glade:127
-msgid "Underline (Ctrl+U)"
-msgstr "Garis Bawah (Ctrl+U)"
+#~ msgid "Delete conversations (Delete, Backspace, A)"
+#~ msgstr "Padam perbualan (Delete, Backspace, A)"
 
-#: ../../ui/composer.glade:88
-msgid "Unquote text (Ctrl+[)"
-msgstr "Nyahpetik teks (Ctrl+[)"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Anda mahu singkirkan mesej belum disimpan?"
 
-#: ../../src/client/geary-args.vala:65
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Pilihan baris perintah \"%s\" tidak dikenali\n"
+#~ msgid "Drop files here"
+#~ msgstr "Lepaskan fail disini"
 
-#: ../../ui/login.glade:457
-msgid "User_name:"
-msgstr "_Nama Pengguna:"
+#~ msgid "E_mail address:"
+#~ msgstr "Alamat e_mel:"
 
-#: ../../ui/password-dialog.glade:70 ../../ui/password-dialog.glade:181
-msgid "Username:"
-msgstr "Nama Pengguna:"
+#~ msgid "Edit account"
+#~ msgstr "Sunting akaun"
 
-#: ../../src/client/geary-application.vala:19
-msgid "Visit the Yorba web site"
-msgstr "Lawati laman sesawang Yorba"
+#~ msgid "Email address:"
+#~ msgstr "Alamat emel:"
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-#, c-format
-msgid "Welcome to Geary."
-msgstr "Selamat datang ke Geary."
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Emel;E-mel;Mel;"
 
-#: ../../ui/login.glade:252
-msgid "Work, Home, etc."
-msgstr "Kerja, Rumah, dll."
+#~ msgid "Enable _spell checking"
+#~ msgstr "Benarkan penyemak _ejaan"
 
-#: ../../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Mel Yahoo!"
+#~ msgid "Encr_yption:"
+#~ msgstr "Pen_yulitan:"
 
-#: ../../src/client/util/util-date.vala:177
-msgid "Yesterday"
-msgstr "Semalam"
+#~ msgid "Encrypt_ion:"
+#~ msgstr "Peny_ulitan:"
 
-#: ../../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 ""
-"Tetapan IMAP dan/atau SMTP anda tidak nyatakan SSL atau TLS. Ini bermakna "
-"nama pengguna dan kata laluan anda dapat dibaca oleh individu lain didalam "
-"rangkaian. Anda pasti hendak membuatnya?"
+#~ msgid "Fixed Width"
+#~ msgstr "Lebar Tetap"
 
-#: ../../src/client/geary-controller.vala:551
-msgid "Your settings are insecure"
-msgstr "Tetapan anda tidak selamat"
+#~ msgid "Geary Mail"
+#~ msgstr "Mel Geary"
 
-#: ../../src/client/geary-controller.vala:258
-#: ../../src/client/ui/stock.vala:21
-msgid "_About"
-msgstr "Perih_al"
+#~ msgid "General"
+#~ msgstr "Am"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:22
-msgid "_Add"
-msgstr "T_ambah"
+#~ msgid "IMAP Credentials"
+#~ msgstr "Kelayakan IMAP"
 
-#: ../../src/client/geary-controller.vala:47
-msgid "_Archive"
-msgstr "_Arkib"
+#~ msgid "IMAP password"
+#~ msgstr "Kata laluan IMAP"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "L_ampir"
+#~ msgid "IMAP settings"
+#~ msgstr "Tetapan IMAP:"
 
-#: ../../ui/composer.glade:525
-msgid "_Attach File"
-msgstr "_Lampir Fail"
+#~ msgid "IMAP username"
+#~ msgstr "Nama pengguna IMAP"
 
-#: ../../ui/preferences.glade:69
-msgid "_Automatically select next message"
-msgstr "Pilih mesej berikutnya secara _automatik"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Condong (Ctrl+I)"
 
-#: ../../src/client/ui/stock.vala:19
-msgid "_Cancel"
-msgstr "_Batal"
+#~ msgid "Lar_ge"
+#~ msgstr "Be_sar"
 
-#: ../../ui/composer.glade:52
-msgid "_Center"
-msgstr "T_engah"
+#~ msgid "Large"
+#~ msgstr "Besar"
 
-#: ../../src/client/ui/stock.vala:23
-msgid "_Close"
-msgstr "_Tutup"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Paut (Ctrl+L)"
 
-#: ../../src/client/views/conversation-viewer.vala:889
-msgid "_Copy"
-msgstr "_Salin"
+#~ msgid "Medium"
+#~ msgstr "Medium"
 
-#: ../../src/client/geary-controller.vala:42
-msgid "_Delete"
-msgstr "Pa_dam"
+#~ msgid "More options"
+#~ msgstr "Lagi pilihan"
 
-#: ../../ui/password-dialog.glade:548
-msgid "_Details"
-msgstr "Pe_rincian"
+#~ msgid "N_ame:"
+#~ msgstr "N_ama:"
 
-#: ../../src/client/ui/stock.vala:24
-msgid "_Discard"
-msgstr "_Singkir"
+#~ msgid "N_ickname:"
+#~ msgstr "_Gelaran:"
 
-#: ../../ui/preferences.glade:90
-msgid "_Display conversation preview"
-msgstr "_Papar pratonton perbualan"
+#~ msgid "Nickname:"
+#~ msgstr "Gelaran:"
 
-#: ../../src/client/geary-controller.vala:262
-msgid "_Donate"
-msgstr "_Derma"
+#~ msgid "No authentication re_quired"
+#~ msgstr "Tiada pengesahihan di_perlukan"
 
-#: ../../ui/login.glade:782
-msgid "_Download mail:"
-msgstr "_Muat turun mel:"
+#~ msgid "Notifications"
+#~ msgstr "Pemberitahuan"
 
-#: ../../ui/composer.glade:181
-msgid "_Fixed Width"
-msgstr "Lebar _Tetap"
+#~ msgid "P_ort:"
+#~ msgstr "P_ort:"
 
-#: ../../src/client/geary-controller.vala:328
-#: ../../src/client/views/conversation-viewer.vala:1457
-msgid "_Forward"
-msgstr "_Maju"
+#~ msgid "Pass_word:"
+#~ msgstr "Ka_ta Laluan:"
 
-#: ../../src/client/geary-controller.vala:254
-#: ../../src/client/ui/stock.vala:25
-msgid "_Help"
-msgstr "Ba_ntuan"
+#~ msgid "Password"
+#~ msgstr "Kata Laluan"
 
-#: ../../ui/composer.glade:542
-msgid "_Include Original Attachments"
-msgstr "_Sertakan Lampiran Asal"
+#~ msgid "Password:"
+#~ msgstr "Kata laluan:"
 
-#: ../../src/client/views/conversation-viewer.vala:922
-msgid "_Inspect"
-msgstr "Per_iksa"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Tampal _Dengan Pemformatan"
 
-#: ../../ui/composer.glade:57
-msgid "_Justify"
-msgstr "_Wajarkan"
+#~ msgid "Please enter your email password"
+#~ msgstr "Sila masukkan kata laluan emel anda"
 
-#: ../../src/client/ui/stock.vala:33
-msgid "_Keep"
-msgstr "_Kekalkan"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Sila tunggu semasa Geary mengesahkan akaun anda."
 
-#: ../../src/client/geary-controller.vala:305
-msgid "_Label"
-msgstr "_Label"
+#~ msgid "Por_t:"
+#~ msgstr "Po_rt:"
 
-#: ../../ui/composer.glade:42
-msgid "_Left"
-msgstr "K_iri"
+#~ msgid "Port:"
+#~ msgstr "Port:"
 
-#: ../../src/client/views/conversation-viewer.vala:1469
-msgid "_Mark as Read"
-msgstr "_Tanda sebagai Dibaca"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Petik teks (Ctrl+])"
 
-#: ../../src/client/views/conversation-viewer.vala:1473
-msgid "_Mark as Unread"
-msgstr "_Tanda sebagai Belum Baca"
+#~ msgid "Reading"
+#~ msgstr "Pembacaan"
 
-#: ../../src/client/geary-controller.vala:271
-msgid "_Mark as..."
-msgstr "_Tanda sebagai..."
+#~ msgid "Real name:"
+#~ msgstr "Nama sebenar:"
 
-#: ../../ui/composer.glade:157
-msgid "_Medium"
-msgstr "Se_derhana"
+#~ msgid "Remove account"
+#~ msgstr "Buang akaun"
 
-#: ../../src/client/geary-controller.vala:309
-msgid "_Move"
-msgstr "A_lih"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Buang pemformatan (Ctrl+Space)"
 
-#: ../../src/client/ui/stock.vala:18
-msgid "_OK"
-msgstr "_OK"
+#~ msgid "SMTP Credentials"
+#~ msgstr "Kelayakan SMTP"
 
-#: ../../src/client/ui/stock.vala:26
-msgid "_Open"
-msgstr "_Buka"
+#~ msgid "SMTP password"
+#~ msgstr "Kata laluan SMTP"
 
-#: ../../ui/login.glade:131 ../../ui/login.glade:539
-#: ../../ui/password-dialog.glade:85
-msgid "_Password:"
-msgstr "Kata _Laluan:"
+#~ msgid "SMTP settings"
+#~ msgstr "Tetapan SMTP"
 
-#: ../../ui/composer.glade:35
-msgid "_Paste"
-msgstr "_Tampal"
+#~ msgid "SMTP username"
+#~ msgstr "Nama pengguna SMTP"
 
-#: ../../ui/preferences.glade:172
-msgid "_Play notification sounds"
-msgstr "_Mainkan bunyi pemberitahuan"
+#~ msgid "SSL"
+#~ msgstr "SSL"
 
-#: ../../src/client/geary-controller.vala:250
-#: ../../src/client/ui/stock.vala:27
-msgid "_Preferences"
-msgstr "_Keutamaan"
+#~ msgid "SSL/TLS encryption:"
+#~ msgstr "Penyulitan SSL/TLS:"
 
-#: ../../src/client/ui/stock.vala:28
-msgid "_Print..."
-msgstr "_Cetak"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTLS"
 
-#: ../../src/client/geary-controller.vala:266
-#: ../../src/client/ui/stock.vala:29
-msgid "_Quit"
-msgstr "K_eluar"
+#~ msgid "S_ans Serif"
+#~ msgstr "S_ans Serif"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "_Rebuild"
-msgstr "B_ina Semula"
+#~ msgid "S_erif"
+#~ msgstr "S_erif"
 
-#: ../../ui/composer.glade:14
-msgid "_Redo"
-msgstr "Buat _Semula"
+#~ msgid "S_ervice:"
+#~ msgstr "P_erkhidmatan:"
 
-#: ../../ui/password-dialog.glade:561
-msgid "_Remember passwords"
-msgstr "_Ingat kata laluan"
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../../src/client/ui/stock.vala:30
-msgid "_Remove"
-msgstr "_Buang"
+#~ msgid "Se_rver:"
+#~ msgstr "Pela_yan:"
 
-#: ../../src/client/geary-controller.vala:1496
-msgid "_Replace"
-msgstr "_Ganti"
+#~ msgid "Send and receive email"
+#~ msgstr "Hantar dan terima emel"
 
-#: ../../src/client/geary-controller.vala:317
-#: ../../src/client/views/conversation-viewer.vala:1447
-msgid "_Reply"
-msgstr "_Balas"
+#~ msgid "Ser_ver:"
+#~ msgstr "Pe_layan:"
 
-#: ../../ui/composer.glade:141
-msgid "_Rich Text"
-msgstr "Teks _Rich"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../../ui/composer.glade:47
-msgid "_Right"
-msgstr "K_anan"
+#~ msgid "Server:"
+#~ msgstr "Pelayan:"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:31
-msgid "_Save"
-msgstr "_Simpan"
+#~ msgid "Service:"
+#~ msgstr "Perkhidmatan:"
 
-#: ../../src/client/views/conversation-viewer.vala:1395
-msgid "_Save As..."
-msgstr "_Simpan Sebagai..."
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Tunjuk pe_mberitahuan bagi mel baru"
 
-#: ../../src/client/views/conversation-viewer.vala:1414
-msgid "_Save Image As..."
-msgstr "_Simpan Imej Sebagai..."
+#~ msgid "Small"
+#~ msgstr "Kecil"
 
-#: ../../ui/composer.glade:594
-msgid "_Send"
-msgstr "_Hantar"
+#~ msgid "Storage"
+#~ msgstr "Storan"
 
-#: ../../ui/composer.glade:163
-msgid "_Small"
-msgstr "_Kecil"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Corer Tembus (Ctrl+K)"
 
-#: ../../src/client/geary-controller.vala:289
-msgid "_Star"
-msgstr "B_intang"
+#~ msgid "To add them as attachments"
+#~ msgstr "Untuk menambah ia sebagai lampiran"
 
-#: ../../ui/composer.glade:7
-msgid "_Undo"
-msgstr "Buat _Asal"
+#~ msgid "Unable to login to email server"
+#~ msgstr "Tidak boleh daftar masuk ke pelayan emel"
 
-#: ../../ui/login.glade:522
-msgid "_Username:"
-msgstr "Na_ma Pengguna:"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Garis Bawah (Ctrl+U)"
 
-#: ../../src/client/views/conversation-viewer.vala:1494
-msgid "_View Source"
-msgstr "_Lihat Sumber"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Nyahpetik teks (Ctrl+[)"
 
-#. / 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 "lampir|dikepil|kepilkan|kepala surat"
+#~ msgid "User_name:"
+#~ msgstr "_Nama Pengguna:"
 
-#: ../../src/client/views/conversation-viewer.vala:1148
-msgid "but actually goes to"
-msgstr "tetapi pergi ke"
+#~ msgid "Username:"
+#~ msgstr "Nama Pengguna:"
 
-#: ../../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "bait"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Kerja, Rumah, dll."
 
-#. / Placeholder filename for attachments with no filename.
-#: ../../src/client/views/conversation-viewer.vala:1799
-#: ../../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "tiada"
+#~ msgid "_Attach File"
+#~ msgstr "_Lampir Fail"
 
-#: ../../src/client/views/conversation-find-bar.vala:226
-msgid "not found"
-msgstr "tidak ditemui"
+#~ msgid "_Automatically select next message"
+#~ msgstr "Pilih mesej berikutnya secara _automatik"
 
-#. / 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 "Abuyop <abuyop gmail com>"
+#~ msgid "_Center"
+#~ msgstr "T_engah"
+
+#~ msgid "_Delete"
+#~ msgstr "Pa_dam"
+
+#~ msgid "_Details"
+#~ msgstr "Pe_rincian"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Papar pratonton perbualan"
+
+#~ msgid "_Donate"
+#~ msgstr "_Derma"
+
+#~ msgid "_Download mail:"
+#~ msgstr "_Muat turun mel:"
+
+#~ msgid "_Fixed Width"
+#~ msgstr "Lebar _Tetap"
+
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Sertakan Lampiran Asal"
+
+#~ msgid "_Justify"
+#~ msgstr "_Wajarkan"
+
+#~ msgid "_Left"
+#~ msgstr "K_iri"
+
+#~ msgid "_Medium"
+#~ msgstr "Se_derhana"
+
+#~ msgid "_Password:"
+#~ msgstr "Kata _Laluan:"
+
+#~ msgid "_Paste"
+#~ msgstr "_Tampal"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Mainkan bunyi pemberitahuan"
+
+#~ msgid "_Redo"
+#~ msgstr "Buat _Semula"
+
+#~ msgid "_Remember passwords"
+#~ msgstr "_Ingat kata laluan"
+
+#~ msgid "_Rich Text"
+#~ msgstr "Teks _Rich"
+
+#~ msgid "_Right"
+#~ msgstr "K_anan"
+
+#~ msgid "_Send"
+#~ msgstr "_Hantar"
+
+#~ msgid "_Small"
+#~ msgstr "_Kecil"
+
+#~ msgid "_Undo"
+#~ msgstr "Buat _Asal"
+
+#~ msgid "_Username:"
+#~ msgstr "Na_ma Pengguna:"
+
+#~ msgid "attach|enclosed|enclosing|cover letter"
+#~ msgstr "lampir|dikepil|kepilkan|kepala surat"
diff --git a/po/nb.po b/po/nb.po
index 794d485..faad970 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -13,454 +13,426 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 22:03+0200\n"
-"PO-Revision-Date: 2015-09-07 22:05+0200\n"
-"Last-Translator: ProsjektX <https://launchpad.net/~prosjektx>\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:08+0000\n"
+"Last-Translator: Stas Solovey <whats_up tut by>\n"
 "Language-Team: https://l10n.gnome.org/teams/no/\n";
-"Language: nb\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: Poedit 1.7.4\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "E-postklient"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary E-post"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Send og motta e-post"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "E-post;E-brev;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Skriv melding"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Send med e-post"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Send filer med Geary"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Lagre"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:55+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: nb\n"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Legg til"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Utkast | Drafts | Draft"
 
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "Flere adresser for %s"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr "Sendt | Sendt e-post | Sent| Sent Mail | Sent Email | Sent E-Mail"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Kontoer"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
+"Søppelpost | Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail "
+"| Bulk Email | Bulk E-Mail"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Først Sist"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Papirkurv | Søppelkurv | Trash | Rubbish | Rubbish Bin"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Welcome to Geary."
-msgstr "Velkommen til Geary."
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr "Arkiv | Arkiv"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Enter your account information to get started."
-msgstr "Oppgi din kontoinformasjon for å komme igang."
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Innboks"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "2 weeks back"
-msgstr "2 uker tilbake"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Utkast"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "1 month back"
-msgstr "1 måned tilbake"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Sendt e-post"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "3 months back"
-msgstr "3 måneder tilbake"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Stjernet"
 
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "6 months back"
-msgstr "6 måneder tilbake"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Viktig"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "1 year back"
-msgstr "1 år tilbake"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "All e-post"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-msgid "2 years back"
-msgstr "2 år tilbake"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Søppelpost"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-msgid "4 years back"
-msgstr "4 år tilbake"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Papirkurv"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "Everything"
-msgstr "Alt"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Utboks"
 
-#: ../src/client/accounts/add-edit-page.vala:280
-msgid "Edit"
-msgstr "Rediger"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Søk"
 
-#: ../src/client/accounts/add-edit-page.vala:282
-msgid "Preview"
-msgstr "_Forhåndsvisning"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Arkiv"
 
-#: ../src/client/accounts/add-edit-page.vala:723
-msgid "Remem_ber passwords"
-msgstr "_Husk passord"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Ingen"
 
-#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "_Husk passord"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:764
-msgid "Unable to validate:\n"
-msgstr "Kan ikke validere:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:766
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Ugyldig konto kallenavn.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:769
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; E-post adresse allerede lagt til Geary.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! e-post"
 
-#: ../src/client/accounts/add-edit-page.vala:773
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP tilkoblingsfeil.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:776
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; IMAP brukernavn eller passord er feil.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Andre"
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP tilkoblingsfeil.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "vedlegg"
 
-#: ../src/client/accounts/add-edit-page.vala:782
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; SMTP brukernavn eller passord er feil.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "blindkopi"
 
-#: ../src/client/accounts/add-edit-page.vala:786
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Tilkoblingsfeil.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "innhold"
 
-#: ../src/client/accounts/add-edit-page.vala:790
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Brukernavn eller passord er feil.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "kopi"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Opphavsrett 2011-2015 Yorba Foundation"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "fra"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Besøk nettsiden til Yorba"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "emne"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Start Geary med hovedvinduet gjemt"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "til"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Lag feilsøkingsinformasjon"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "meg"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Loggfør samtaleovervåking"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(uten emne)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Loggfør nettverksdeserialisering"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a. %e. %b, %Y, kl %-k:%M"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Loggfør nettverksaktivitet"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "Den %1$s, %2$s skreiv:"
 
-#. / 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 "Loggfør IMAP svarkø"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s skreiv:"
 
-#. / 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 "Loggfør nettverksserialisering"
+#. / 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:234
+msgid "On %s:"
+msgstr "På %s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Loggfør periodisk aktivitet"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Videresendt melding ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Loggfør databaseforespørsler (genererer veldig mange meldinger)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Fra: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Loggfør mappenormalisering"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Emne: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Tillat inspeksjon av WebView"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Dato: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Tilbakekall alle tjenersertifikater med TLS varsler"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Til: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Vis programversjon"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Kopier: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Bruk %s for å åpne et nytt meldingsvindu"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "ingen"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Vennligst send kommentarer, forslag og feilrapporter til:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "E-postklient"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Klarte ikke å tolke kommandolinjens valg: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "Opphavsrett 2011-2015 Yorba Foundation"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Ugjenkjennelig kommandolinjevalg \"%s\"\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Besøk nettsiden til Yorba"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:61
 msgid "Delete conversation"
 msgstr "Slett samtale"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Slett samtalen (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Slett samtaler (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:67
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Flytt samtalen til papirkurven (Delete, Rettetast)"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:68
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "Flytt samtalene til papirkurven (Delete, Rettetast)"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Arkiv"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Arkiver samtalen (A)"
 
-#: ../src/client/application/geary-controller.vala:75
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Arkiver samtaler (A)"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Marker som sø_ppelpost"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Marker som ikke sø_ppelpost"
 
-#: ../src/client/application/geary-controller.vala:81
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Marker samtalen"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Marker samtaler"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Sett merkelapp på samtalen"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Sett merkelapp på samtaler"
 
-#: ../src/client/application/geary-controller.vala:85
-#: ../src/client/application/geary-controller.vala:436
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Flytt samtalen"
 
-#: ../src/client/application/geary-controller.vala:86
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Flytt samtaler"
 
-#: ../src/client/application/geary-controller.vala:373
-#: ../ui/app_menu.interface.h:1
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "K_ontoer"
 
-#: ../src/client/application/geary-controller.vala:378
-#: ../src/client/components/stock.vala:27 ../ui/app_menu.interface.h:2
+#: ../src/client/application/geary-controller.vala:377
+#: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Innstillinger"
 
-#: ../src/client/application/geary-controller.vala:382
-#: ../src/client/components/stock.vala:25 ../ui/app_menu.interface.h:4
+#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../src/client/application/geary-controller.vala:386
-#: ../src/client/components/stock.vala:21 ../ui/app_menu.interface.h:5
+#: ../src/client/application/geary-controller.vala:385
+#: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/client/application/geary-controller.vala:390
-#: ../ui/app_menu.interface.h:3
-msgid "_Donate"
-msgstr "_Doner"
-
-#: ../src/client/application/geary-controller.vala:394
-#: ../src/client/components/stock.vala:29 ../ui/app_menu.interface.h:6
+#: ../src/client/application/geary-controller.vala:389
+#: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: ../src/client/application/geary-controller.vala:399
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Merk som..."
 
-#: ../src/client/application/geary-controller.vala:405
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Marker som _lest"
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Marker som _ulest"
 
-#: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Stjerne"
 
-#: ../src/client/application/geary-controller.vala:422
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "F_jern stjerne"
 
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Legg til merkelapp"
 
-#: ../src/client/application/geary-controller.vala:433
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Merkelapp"
 
-#: ../src/client/application/geary-controller.vala:437
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../src/client/application/geary-controller.vala:441
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Skriv ny melding (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:445
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Svar"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Svar (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:450
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "Sv_ar alle"
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Svar alle (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Videresend (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:496
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr "Tøm"
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr "Tøm søppelpost eller papirkurv"
 
-#: ../src/client/application/geary-controller.vala:501
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr "Tøm _søppelpost..."
 
-#: ../src/client/application/geary-controller.vala:505
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr "Tøm _papirkurv..."
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:538
+#: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
 msgstr "Vis/skjul søkefelt"
 
-#: ../src/client/application/geary-controller.vala:752
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Kunne ikke lagre klareringsavvik for tjener"
 
-#: ../src/client/application/geary-controller.vala:989
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Dine innstillinger er utrygge"
 
-#: ../src/client/application/geary-controller.vala:990
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -471,17 +443,17 @@ msgstr ""
 "klartekst, som gjør det mulig for andre å plukke det opp. Er du sikker på at "
 "du ønsker å fortsette?"
 
-#: ../src/client/application/geary-controller.vala:991
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "Fo_rtsett"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Feil under sending av e-post"
 
-#: ../src/client/application/geary-controller.vala:1070
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -489,14 +461,12 @@ msgstr ""
 "Geary fikk et problem med å sende en e-post. Hvis problemet vedvarer "
 "vennligst slett e-posten manuelt fra din Utboks mappe."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Feil ved lagring av sent e-post"
 
-#: ../src/client/application/geary-controller.vala:1075
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -504,20 +474,15 @@ msgstr ""
 "Geary fikk et problem med å lagre en sent melding til Sendt e-post. "
 "Meldingen vil forbli i din Utboks mappe til du sletter den."
 
-#: ../src/client/application/geary-controller.vala:1144
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Merkelapper"
 
-#. 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:1156
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Kunne ikke åpne databasen for %s"
 
-#: ../src/client/application/geary-controller.vala:1157
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -540,21 +505,19 @@ msgstr ""
 "Gjenoppbygge databasen vil slette all lokal e-post og dens vedlegg. <b>E-"
 "posten på serveren vil ikke bli påvirket.</b>"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "_Gjenoppbygg"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "Av_slutt"
 
-#: ../src/client/application/geary-controller.vala:1168
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Kunne ikke gjenoppbygge database for \"%s\""
 
-#: ../src/client/application/geary-controller.vala:1169
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -564,17 +527,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1191
-#: ../src/client/application/geary-controller.vala:1201
-#: ../src/client/application/geary-controller.vala:1212
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Kunne ikke åpne lokal e-postboks for %s"
 
-#: ../src/client/application/geary-controller.vala:1192
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -592,7 +551,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1202
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -606,7 +565,7 @@ msgstr ""
 "\n"
 "Vennligst innstaller den siste versjonen av Geary og førsøk igjen."
 
-#: ../src/client/application/geary-controller.vala:1213
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -618,27 +577,29 @@ msgstr ""
 "\n"
 "Vennligst verifiser din nettverksforbindelse og start Geary på nytt."
 
-#: ../src/client/application/geary-controller.vala:1721
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "Om %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1724
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
-msgstr "ProsjektX <https://launchpad.net/~prosjektx>"
+msgstr ""
+"ProsjektX <https://launchpad.net/~prosjektx>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Stas Solovey https://launchpad.net/~whats-up";
 
-#: ../src/client/application/geary-controller.vala:1990
+#: ../src/client/application/geary-controller.vala:1976
 msgid "Undo move (Ctrl+Z)"
 msgstr "Angre flytting (Ctrl+U)"
 
-#: ../src/client/application/geary-controller.vala:2000
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Er du sikker på at du vil åpne \"%s\"?"
 
-#: ../src/client/application/geary-controller.vala:2001
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -646,297 +607,526 @@ msgstr ""
 "Vedlegg kan forårsake skade på ditt system om åpnet. Åpne filer bare fra "
 "klarerte avsendere."
 
-#: ../src/client/application/geary-controller.vala:2002
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Ikke _spør meg igjen"
 
-#: ../src/client/application/geary-controller.vala:2020
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "En fil med navnet \"%s\" finnes fra før. Vil du erstatte den?"
 
-#: ../src/client/application/geary-controller.vala:2022
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "Filen finnes allerede i \"%s\". Innholdet vil overskrives hvis du erstatter "
 "filen."
 
-#: ../src/client/application/geary-controller.vala:2025
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Erstatt"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2323
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Lukke åpnet meldingsutkast?"
 
-#: ../src/client/application/geary-controller.vala:2453
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr "Tømme all e-post fra %s mappen?"
 
-#: ../src/client/application/geary-controller.vala:2454
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr "Dette fjerner e-post fra Geary og e-postserveren."
 
-#: ../src/client/application/geary-controller.vala:2455
+#: ../src/client/application/geary-controller.vala:2441
 msgid "This cannot be undone."
 msgstr "Dette kan ikke gjøres om."
 
-#: ../src/client/application/geary-controller.vala:2456
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr "Tøm %s"
 
-#: ../src/client/application/geary-controller.vala:2473
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 msgid "Error emptying %s"
 msgstr "Feil under sletting av %s"
 
-#: ../src/client/application/geary-controller.vala:2503
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Ønsker du å slette denne meldingen permanent?"
 msgstr[1] "Ønsker du å slette disse meldingene permanent?"
 
-#: ../src/client/application/geary-controller.vala:2505
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Slett"
 
-#: ../src/client/application/geary-controller.vala:2536
+#: ../src/client/application/geary-controller.vala:2522
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Angre arkivering (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2551
+#: ../src/client/application/geary-controller.vala:2537
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Angre flytting til papirkurv (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2604
+#: ../src/client/application/geary-controller.vala:2590
 msgid "Undo (Ctrl+Z)"
 msgstr "Angre (Ctrl+Z)"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i treff"
-msgstr[1] "%i treff"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Start Geary med hovedvinduet gjemt"
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i treff (sideskift)"
-msgstr[1] "%i treff (sideskift)"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Lag feilsøkingsinformasjon"
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "ikke funnet"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Loggfør samtaleovervåking"
 
-#: ../src/client/components/main-window.vala:430
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Loggfør nettverksdeserialisering"
 
-#: ../src/client/components/search-bar.vala:10
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Søk"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Loggfør nettverksaktivitet"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:25
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Søk i all e-post på kontoen for nøkkelord (Ctrl+S)"
+#. / 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 "Loggfør IMAP svarkø"
 
-#: ../src/client/components/search-bar.vala:118
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indekserer %s konto"
+#. / 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 "Loggfør nettverksserialisering"
 
-#: ../src/client/components/search-bar.vala:129
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Søk %s konto"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Loggfør periodisk aktivitet"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Sender..."
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Loggfør databaseforespørsler (genererer veldig mange meldinger)"
 
-#: ../src/client/components/stock.vala:18 ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_OK"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Loggfør mappenormalisering"
 
-#: ../src/client/components/stock.vala:19 ../ui/edit_alternate_emails.glade.h:3
-#: ../ui/password-dialog.glade.h:5 ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Avbryt"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Tillat inspeksjon av WebView"
 
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Lukk"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Tilbakekall alle tjenersertifikater med TLS varsler"
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Forkast"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Vis programversjon"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Åpne"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Bruk %s for å åpne et nytt meldingsvindu"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "Skriv _ut..."
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Vennligst send kommentarer, forslag og feilrapporter til:"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Fjern"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Klarte ikke å tolke kommandolinjens valg: %s\n"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "Velg _alt"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Ugjenkjennelig kommandolinjevalg \"%s\"\n"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Behold"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Nye Meldinger"
 
-#: ../src/client/composer/composer-widget.vala:73
-msgid "Saved"
-msgstr "Lagret"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d ny melding"
+msgstr[1] "%d nye meldinger"
 
-#: ../src/client/composer/composer-widget.vala:74
-msgid "Saving"
-msgstr "Lagrer"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d ny melding totalt"
+msgstr[1] "%s, %d nye meldinger totalt"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "Error saving"
-msgstr "Feil under lagring"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d annen ny melding for %s)"
+msgstr[1] ""
+"%s\n"
+"(%d andre nye meldinger for %s)"
 
-#: ../src/client/composer/composer-widget.vala:76
-msgid "Press Backspace to delete quote"
-msgstr "Trykk rettetast for å slette samtale"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Åpne"
 
-#: ../src/client/composer/composer-widget.vala:77
-msgid "New Message"
-msgstr "Ny melding"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Meg"
 
-#. A 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:138
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr "Uklarert tilkobling: %s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr "Identiteten til %s e-post tjener ved %s:%u kunne ikke verifiseres."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
 msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
-"vedlegg|attach|attaching|attaches|attachment|attachments|attached|enclose|"
-"enclosed|enclosing|encloses|enclosure|enclosures"
+"Ved å velge \"Klarer denne tjener\" eller \"Alltid klarer denne tjener\" kan "
+"ditt brukernavn og passord bli overført usikkert."
 
-#: ../src/client/composer/composer-widget.vala:1102
-#: ../src/client/composer/composer-widget.vala:1106
-msgid "Do you want to discard this message?"
-msgstr "Ønsker du å forkaste denne meldingen?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"Ved å velge \"Ikke klarer denne tjener\" vil Geary ikke aksessere denne "
+"tjener."
 
-#: ../src/client/composer/composer-widget.vala:1262
-msgid "Send message with an empty subject and body?"
-msgstr "Sende melding med tom tittel og innhold?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Geary vil ikke legge til eller oppdatere denne e-post kontoen."
 
-#: ../src/client/composer/composer-widget.vala:1264
-msgid "Send message with an empty subject?"
-msgstr "Sende melding med tom tittel?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"Ved å velge \"Ikke klarer denne tjener\" vil det ført til at Geary ikke "
+"lenger aksesserer denne konto."
 
-#: ../src/client/composer/composer-widget.vala:1266
-msgid "Send message with an empty body?"
-msgstr "Sende melding med tomt innhold?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr "Geary vil avslutte hvis du ikke har andre e-post kontoer åpnet."
 
-#: ../src/client/composer/composer-widget.vala:1268
-msgid "Send message without an attachment?"
-msgstr "Sende melding uten et vedlegg?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Kontakt din systemadministrator eller e-post tjenesteleverandør hvis du har "
+"spørsmål om disse sakene."
 
-#: ../src/client/composer/composer-widget.vala:1530
-msgid "Cannot add attachment"
-msgstr "Kan ikke legge til vedlegg"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr "Tjenerens sertifikat er ikke signert av en kjent autoritet"
 
-#: ../src/client/composer/composer-widget.vala:1541
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "\"%s\" kunne ikke bli funnet."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr "Tjenerens sertifikat samsvarer ikke med identiteten i sertifikatet"
 
-#: ../src/client/composer/composer-widget.vala:1548
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" er en mappe."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Tjenerens sertifikat har utløpt"
 
-#: ../src/client/composer/composer-widget.vala:1555
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" er en tom fil."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "Tjenerens sertifikat har ikke blitt aktivert"
 
-#: ../src/client/composer/composer-widget.vala:1569
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "\"%s\" kunne ikke åpnes for lesing."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "Tjenerens sertifikat har blitt trukket tilbake og er nå ugyldig"
 
-#: ../src/client/composer/composer-widget.vala:1576
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" er allerede lagt ved for levering."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "Tjenerens sertifikat er betraktet som usikkert"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1585
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr "En feil oppstod under behandling av tjenerens sertifikat"
 
-#: ../src/client/composer/composer-widget.vala:1645
-msgid "To: "
-msgstr "Til: "
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr "Geary trenger ditt e-post passord for å fortsette"
 
-#: ../src/client/composer/composer-widget.vala:1648
-msgid "Cc: "
-msgstr "Kopi:"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Velg en fil"
 
-#: ../src/client/composer/composer-widget.vala:1651
-msgid "Bcc: "
-msgstr "Blindkopi:"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Legg ved"
 
-#: ../src/client/composer/composer-widget.vala:1654
-msgid "Reply-To: "
-msgstr "Svar til:"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr "Flere adresser for %s"
 
-#: ../src/client/composer/composer-widget.vala:1887
-msgid "Select Color"
-msgstr "Velg farge"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Kontoer"
 
-#. 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:2322
-#, c-format
-msgid "%1$s via %2$s"
-msgstr "%1$s via %2$s"
+#. / 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 "Først Sist"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2364
-msgid "_From:"
-msgstr "_Fra:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Velkommen til Geary."
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Meg"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Oppgi din kontoinformasjon for å komme igang."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 uker tilbake"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 måned tilbake"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 måneder tilbake"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 måneder tilbake"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 år tilbake"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "2 år tilbake"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "4 år tilbake"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Alt"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "Rediger"
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr "_Forhåndsvisning"
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "_Husk passord"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "_Husk passord"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Kan ikke validere:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Ugyldig konto kallenavn.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; E-post adresse allerede lagt til Geary.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; IMAP tilkoblingsfeil.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; IMAP brukernavn eller passord er feil.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; SMTP tilkoblingsfeil.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; SMTP brukernavn eller passord er feil.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Tilkoblingsfeil.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Brukernavn eller passord er feil.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Lagre"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Legg til"
+
+#. / 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 "%B %-e, %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 "Nå"
+
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "%dm siden"
+msgstr[1] "%dm siden"
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "%dt siden"
+msgstr[1] "%dt siden"
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "I går"
+
+#. / 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
+msgid "%A"
+msgstr "%A"
+
+#: ../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/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d melding"
+msgstr[1] "%d meldinger"
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d ulest"
+msgstr[1] "%d uleste"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Innbokser"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Søk %s konto"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d resultat"
+msgstr[1] "%d resultater"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "Ingen samtaler valgt."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "%u samtale valgt."
@@ -991,40 +1181,36 @@ msgid "Date:"
 msgstr "Dato:"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "%u lest melding"
 msgstr[1] "%u leste meldinger"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr "Denne meldingen ble sendt men kunne ikke lagres til %s."
 
-#. Add a menu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Kopier"
 
-#. Add a menu item for copying the address.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "Kopier _e-postadressen"
 
-#. Add a menu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Kopier _lenke"
 
-#. Select message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "Velg _melding"
 
-#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Velg _alt"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "_Inspiser"
@@ -1037,10 +1223,9 @@ msgstr "Denne lenken ser ut til å gå til"
 msgid "but actually goes to"
 msgstr "men går faktisk til"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
-msgstr "(Ugyldig?)"
+msgstr " (Ugyldig?)"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1718
 msgid "_Save Image As..."
@@ -1060,12 +1245,10 @@ msgid_plural "Save All A_ttachments..."
 msgstr[0] "Lagre v_edlegg..."
 msgstr[1] "Lagre alle v_edlegg..."
 
-#. Reply to all on a message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "Svar _alle"
 
-#. Mark as read/unread.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "_Merk som lest"
@@ -1078,1060 +1261,607 @@ msgstr "_Merk som ulest"
 msgid "Mark Unread From _Here"
 msgstr "Marker som ulest fra _her"
 
-#. Separator.
-#. View original message source.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "Vis meldings_data"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:378
-msgid "none"
-msgstr "ingen"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "Kunne ikke åpne tekstbehandlingsprogrammet."
 
 #: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s - Samtale Inspektør"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Velg en fil"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Lagret"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Legg ved"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Lagrer"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
-msgid "Untrusted Connection: %s"
-msgstr "Uklarert tilkobling: %s"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Feil under lagring"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
-msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr "Identiteten til %s e-post tjener ved %s:%u kunne ikke verifiseres."
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "Trykk rettetast for å slette samtale"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
-msgid ""
-"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-"your username and password to be transmitted insecurely."
-msgstr ""
-"Ved å velge \"Klarer denne tjener\" eller \"Alltid klarer denne tjener\" kan "
-"ditt brukernavn og passord bli overført usikkert."
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Ny melding"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-"server."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Ved å velge \"Ikke klarer denne tjener\" vil Geary ikke aksessere denne "
-"tjener."
+"vedlegg|attach|attaching|attaches|attachment|attachments|attached|enclose|enc"
+"losed|enclosing|encloses|enclosure|enclosures"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
-msgid "Geary will not add or update this email account."
-msgstr "Geary vil ikke legge til eller oppdatere denne e-post kontoen."
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Ønsker du å forkaste denne meldingen?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-"this account."
-msgstr ""
-"Ved å velge \"Ikke klarer denne tjener\" vil det ført til at Geary ikke "
-"lenger aksesserer denne konto."
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Sende melding med tom tittel og innhold?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr "Geary vil avslutte hvis du ikke har andre e-post kontoer åpnet."
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Sende melding med tom tittel?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
-msgid ""
-"Contact your system administrator or email service provider if you have any "
-"question about these issues."
-msgstr ""
-"Kontakt din systemadministrator eller e-post tjenesteleverandør hvis du har "
-"spørsmål om disse sakene."
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Sende melding med tomt innhold?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
-msgstr "Tjenerens sertifikat er ikke signert av en kjent autoritet"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Sende melding uten et vedlegg?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
-msgid "The server's identity does not match the identity in the certificate"
-msgstr "Tjenerens sertifikat samsvarer ikke med identiteten i sertifikatet"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Kan ikke legge til vedlegg"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
-msgid "The server's certificate has expired"
-msgstr "Tjenerens sertifikat har utløpt"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "\"%s\" kunne ikke bli funnet."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
-msgid "The server's certificate has not been activated"
-msgstr "Tjenerens sertifikat har ikke blitt aktivert"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" er en mappe."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
-msgid "The server's certificate has been revoked and is now invalid"
-msgstr "Tjenerens sertifikat har blitt trukket tilbake og er nå ugyldig"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" er en tom fil."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
-msgid "The server's certificate is considered insecure"
-msgstr "Tjenerens sertifikat er betraktet som usikkert"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "\"%s\" kunne ikke åpnes for lesing."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
-msgid "An error has occurred processing the server's certificate"
-msgstr "En feil oppstod under behandling av tjenerens sertifikat"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "\"%s\" er allerede lagt ved for levering."
 
-#. 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 "Geary requires your email password to continue"
-msgstr "Geary trenger ditt e-post passord for å fortsette"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. 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 melding"
-msgstr[1] "%d meldinger"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Til: "
 
-#. / 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 ulest"
-msgstr[1] "%d uleste"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Kopi: "
 
-#. / 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/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Blindkopi: "
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Innbokser"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "Svar til: "
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d resultat"
-msgstr[1] "%d resultater"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Velg farge"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Nye Meldinger"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr "%1$s via %2$s"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d ny melding"
-msgstr[1] "%d nye meldinger"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_Fra:"
 
-#: ../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 ny melding totalt"
-msgstr[1] "%s, %d nye meldinger totalt"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 annen ny melding for %s)"
-msgstr[1] ""
-"%s\n"
-"(%d andre nye meldinger for %s)"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Sender..."
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Åpne"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i treff"
+msgstr[1] "%i treff"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i treff (sideskift)"
+msgstr[1] "%i treff (sideskift)"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "ikke funnet"
 
-#. / 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"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_OK"
 
-#. / 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"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Avbryt"
 
-#. / 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"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Lukk"
 
-#. / 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 "%B %-e, %Y %-l:%M %P"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Forkast"
 
-#. / 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"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Åpne"
 
-#. / 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/components/stock.vala:28
+msgid "_Print..."
+msgstr "Skriv _ut..."
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Nå"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Fjern"
 
-#: ../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "%dm siden"
-msgstr[1] "%dm siden"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Behold"
 
-#: ../src/client/util/util-date.vala:171
-#, c-format
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "%dt siden"
-msgstr[1] "%dt siden"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Søk i all e-post på kontoen for nøkkelord (Ctrl+S)"
 
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "I går"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Indekserer %s konto"
 
-#. / 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"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(uten emne)"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary E-post"
 
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "bytes"
+#~ msgid "Send and receive email"
+#~ msgstr "Send og motta e-post"
 
-#: ../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "E-post;E-brev;"
 
-#: ../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#~ msgid "Compose Message"
+#~ msgstr "Skriv melding"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#~ msgid "Send by email"
+#~ msgstr "Send med e-post"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#~ msgid "Send files using Geary"
+#~ msgstr "Send filer med Geary"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#~ msgid "_Donate"
+#~ msgstr "_Doner"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! e-post"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Kan ikke fjerne kontoen</span> "
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Et meldingsvindu knyttet til denne kontoen er åpen. Send eller forkast "
+#~ "meldingen og prøv igjen."
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Andre"
+#~ msgid "Add account"
+#~ msgstr "Legg til konto"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#~ msgid "Edit account"
+#~ msgstr "Rediger konto"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#~ msgid "Remove account"
+#~ msgstr "Fjern konto"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Innboks"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Vennligst vent mens Geary validerer kontoen din."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Utkast"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Uklarert tilkobling"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Sendt e-post"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "_Alltid klarer denne tjener"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Stjernet"
+#~ msgid "_Trust This Server"
+#~ msgstr "_Klarer denne tjener"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Viktig"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "_Ikke klarer denne tjener"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "All e-post"
+#~ msgid "_Undo"
+#~ msgstr "_Angre"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Søppelpost"
+#~ msgid "_Redo"
+#~ msgstr "_Gjenopprett"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Papirkurv"
+#~ msgid "Cu_t"
+#~ msgstr "Klipp u_t"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Utboks"
+#~ msgid "_Paste"
+#~ msgstr "_Lim inn"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Arkiv"
+#~ msgid "_Left"
+#~ msgstr "_Venstre"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-msgstr "Ingen"
+#~ msgid "_Right"
+#~ msgstr "_Høyre"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-msgid "attachment"
-msgstr "vedlegg"
+#~ msgid "_Center"
+#~ msgstr "_Senter"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
-msgstr "blindkopi"
+#~ msgid "_Justify"
+#~ msgstr "_Blokkjuster"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
-msgstr "innhold"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Lenke (Ctrl+L)"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "cc"
-msgstr "kopi"
+#~ msgid "C_olor"
+#~ msgstr "F_arge"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
-msgstr "fra"
+#~ msgid "More options"
+#~ msgstr "Flere valg"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-msgid "subject"
-msgstr "emne"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Siter tekst (Ctrl+])"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
-msgstr "til"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Fjern sitering av tekst (Ctrl+[)"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
-msgstr "meg"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Fjern formatering (Ctrl+Space)"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-msgid "Drafts | Draft"
-msgstr "Utkast | Drafts | Draft"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Lim inn _med formattering"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "Sendt | Sendt e-post | Sent| Sent Mail | Sent Email | Sent E-Mail"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Fet (Ctrl+B)"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
-msgstr ""
-"Søppelpost | Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail "
-"| Bulk Email | Bulk E-Mail"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Kursiv (Ctrl+I)"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Papirkurv | Søppelkurv | Trash | Rubbish | Rubbish Bin"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Understrek (Ctrl+U)"
 
-#. List of folder names to match for Archive, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
-msgid "Archive | Archives"
-msgstr "Arkiv | Arkiv"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Gjennomstrek (Ctrl+K)"
 
-#. / 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:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a. %e. %b, %Y, kl %-k:%M"
+#~ msgid "_Rich Text"
+#~ msgstr "_Rik tekst"
 
-#. / 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:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "Den %1$s, %2$s skreiv:"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Vis utvidede felter"
 
-#. / 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:228
-#, c-format
-msgid "%s wrote:"
-msgstr "%s skreiv:"
+#~ msgctxt "Label"
+#~ msgid "Close and Save"
+#~ msgstr "Lukk og lagre"
 
-#. / 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:234
-#, c-format
-msgid "On %s:"
-msgstr "På %s:"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "Lukk og lagre"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Videresendt melding ----------"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "Lukk og lagre"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "Fra: %s\n"
+#~ msgctxt "Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Lukk og forkast"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Emne: %s\n"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Lukk og forkast"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "Dato: %s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "Lukk og forkast"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "Til: %s\n"
+#~ msgid "Lar_ge"
+#~ msgstr "St_or"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Kopier: %s\n"
+#~ msgid "Large"
+#~ msgstr "Stor"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">Kan ikke fjerne kontoen</span> "
+#~ msgid "_Medium"
+#~ msgstr "_Medium"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Et meldingsvindu knyttet til denne kontoen er åpen. Send eller forkast "
-"meldingen og prøv igjen."
+#~ msgid "Medium"
+#~ msgstr "Medium"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Legg til konto"
+#~ msgid "_Small"
+#~ msgstr "_Liten"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Rediger konto"
+#~ msgid "Small"
+#~ msgstr "Liten"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Fjern konto"
+#~ msgid "S_ans Serif"
+#~ msgstr "S_ans Serif"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Vennligst vent mens Geary validerer kontoen din."
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Uklarert tilkobling"
+#~ msgid "S_erif"
+#~ msgstr "S_erif"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "_Alltid klarer denne tjener"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "_Klarer denne tjener"
+#~ msgid "_Fixed Width"
+#~ msgstr "_Fast bredde"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "_Ikke klarer denne tjener"
+#~ msgid "Fixed Width"
+#~ msgstr "Fast bredde"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Angre"
-
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Gjenopprett"
-
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "Klipp u_t"
-
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "_Lim inn"
-
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Venstre"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Høyre"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Senter"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Blokkjuster"
-
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Lenke (Ctrl+L)"
-
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "F_arge"
-
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Flere valg"
-
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Siter tekst (Ctrl+])"
-
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Fjern sitering av tekst (Ctrl+[)"
-
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Fjern formatering (Ctrl+Space)"
-
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Lim inn _med formattering"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Fet (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Kursiv (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Understrek (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Gjennomstrek (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "_Rik tekst"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Vis utvidede felter"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "Lukk og lagre"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "Lukk og lagre"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "Lukk og lagre"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "Lukk og forkast"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "Lukk og forkast"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "Lukk og forkast"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "St_or"
-
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "Stor"
-
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "_Medium"
-
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "Medium"
-
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "_Liten"
-
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "Liten"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
-
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "S_erif"
-
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "Serif"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "_Fast bredde"
-
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "Fast bredde"
-
-#: ../ui/composer.glade.h:42
-msgid "Detach"
-msgstr "Koble fra vinduet"
-
-#: ../ui/composer.glade.h:43
-msgid "Detach (Ctrl+D)"
-msgstr "Koble fra vinduet (Ctrl+D)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_Send"
-
-#: ../ui/composer.glade.h:45
-msgid "Send"
-msgstr "Send"
-
-#: ../ui/composer.glade.h:46
-msgid "Send (Ctrl+Enter)"
-msgstr "Send (Ctrl+Enter)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "_Legg ved fil"
-
-#: ../ui/composer.glade.h:48
-msgid "Attach File"
-msgstr "Legg ved fil"
-
-#: ../ui/composer.glade.h:49
-msgid "_Include Original Attachments"
-msgstr "_Inkluder opprinnelige vedlegg"
-
-#: ../ui/composer.glade.h:50
-msgid "Include Original Attachments"
-msgstr "Inkluder opprinnelige vedlegg"
-
-#: ../ui/composer.glade.h:51
-msgid "Application Menu"
-msgstr "Programmeny"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:53
-msgid "_To"
-msgstr "_Til"
+#~ msgid "Detach"
+#~ msgstr "Koble fra vinduet"
 
-#: ../ui/composer.glade.h:54
-msgid "_Cc"
-msgstr "_Kopi"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Koble fra vinduet (Ctrl+D)"
 
-#: ../ui/composer.glade.h:55
-msgid "_Subject"
-msgstr "_Emne"
+#~ msgid "_Send"
+#~ msgstr "_Send"
 
-#: ../ui/composer.glade.h:56
-msgid "_Bcc"
-msgstr "_Blindkopi"
+#~ msgid "Send"
+#~ msgstr "Send"
 
-#: ../ui/composer.glade.h:57
-msgid "_Reply-To"
-msgstr "_Svar til"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Send (Ctrl+Enter)"
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:59
-msgid "From"
-msgstr "Fra"
+#~ msgid "_Attach File"
+#~ msgstr "_Legg ved fil"
 
-#: ../ui/composer.glade.h:60
-msgid "Drop files here"
-msgstr "Slipp filer her"
+#~ msgid "Attach File"
+#~ msgstr "Legg ved fil"
 
-#: ../ui/composer.glade.h:61
-msgid "To add them as attachments"
-msgstr "For å legge dem til som vedlegg"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Inkluder opprinnelige vedlegg"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-msgid "Remove email address"
-msgstr "Fjern e-postadresse"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Inkluder opprinnelige vedlegg"
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
+#~ msgid "Application Menu"
+#~ msgstr "Programmeny"
 
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "_Oppdater"
+#~ msgid "_To"
+#~ msgstr "_Til"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Finn:"
+#~ msgid "_Cc"
+#~ msgstr "_Kopi"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Forrige"
+#~ msgid "_Subject"
+#~ msgstr "_Emne"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Neste"
+#~ msgid "_Bcc"
+#~ msgstr "_Blindkopi"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "S_kill mellom store og små bokstaver"
+#~ msgid "_Reply-To"
+#~ msgstr "_Svar til"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "merkelapp"
+#~ msgid "From"
+#~ msgstr "Fra"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Passord"
+#~ msgid "Drop files here"
+#~ msgstr "Slipp filer her"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "E-postadresse"
+#~ msgid "To add them as attachments"
+#~ msgstr "For å legge dem til som vedlegg"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Passord"
+#~ msgid "Remove email address"
+#~ msgstr "Fjern e-postadresse"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "Tj_eneste"
+#~ msgid "_Update"
+#~ msgstr "_Oppdater"
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "N_avn"
+#~ msgid "Find:"
+#~ msgstr "Finn:"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "_Kallenavn"
+#~ msgid "_Previous"
+#~ msgstr "_Forrige"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Arbeid, Hjemme, osv."
+#~ msgid "_Next"
+#~ msgstr "_Neste"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_Lagre sendt e-post"
+#~ msgid "_Case sensitive"
+#~ msgstr "S_kill mellom store og små bokstaver"
 
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
-msgstr "_Flere e-postadresser …"
+#~ msgid "label"
+#~ msgstr "merkelapp"
 
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "IMAP innstillinger"
+#~ msgid "Password"
+#~ msgstr "Passord"
 
-#: ../ui/login.glade.h:12
-msgid "Se_rver"
-msgstr "Tj_ener"
+#~ msgid "E_mail address"
+#~ msgstr "E-postadresse"
 
-#: ../ui/login.glade.h:13
-msgid "P_ort"
-msgstr "P_ort"
+#~ msgid "_Password"
+#~ msgstr "_Passord"
 
-#: ../ui/login.glade.h:14
-msgid "Ser_ver"
-msgstr "Tje_ner"
+#~ msgid "S_ervice"
+#~ msgstr "Tj_eneste"
 
-#: ../ui/login.glade.h:15
-msgid "Por_t"
-msgstr "Por_t"
+#~ msgid "N_ame"
+#~ msgstr "N_avn"
 
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "SMTP innstillinger"
+#~ msgid "N_ickname"
+#~ msgstr "_Kallenavn"
 
-#: ../ui/login.glade.h:17
-msgid "User_name"
-msgstr "Bruker_navn"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Arbeid, Hjemme, osv."
 
-#: ../ui/login.glade.h:18
-msgid "Pass_word"
-msgstr "Pass_ord"
+#~ msgid "_Save sent mail"
+#~ msgstr "_Lagre sendt e-post"
 
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr "SMTP brukernavn"
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "_Flere e-postadresser …"
 
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr "SMTP passord"
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP innstillinger"
 
-#: ../ui/login.glade.h:21
-msgid "_Username"
-msgstr "_Brukernavn"
+#~ msgid "Se_rver"
+#~ msgstr "Tj_ener"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr "IMAP brukernavn"
+#~ msgid "P_ort"
+#~ msgstr "P_ort"
 
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr "IMAP passord"
+#~ msgid "Ser_ver"
+#~ msgstr "Tje_ner"
 
-#: ../ui/login.glade.h:24
-msgid "Encr_yption"
-msgstr "Kryp_tering"
+#~ msgid "Por_t"
+#~ msgstr "Por_t"
 
-#: ../ui/login.glade.h:25
-msgid "Encrypt_ion"
-msgstr "Krypter_ing"
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP innstillinger"
 
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "User_name"
+#~ msgstr "Bruker_navn"
 
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "Pass_word"
+#~ msgstr "Pass_ord"
 
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "Ingen autentisering på_krevd"
+#~ msgid "SMTP username"
+#~ msgstr "SMTP brukernavn"
 
-#: ../ui/login.glade.h:30
-msgid "Use IMAP cre_dentials"
-msgstr "Bruk IMAP påloggings_informasjon"
+#~ msgid "SMTP password"
+#~ msgstr "SMTP passord"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Skrive meldinger"
+#~ msgid "_Username"
+#~ msgstr "_Brukernavn"
 
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr "Lagre _utkast på tjener"
+#~ msgid "IMAP username"
+#~ msgstr "IMAP brukernavn"
 
-#: ../ui/login.glade.h:33
-msgid "Si_gn emails (HTML allowed):"
-msgstr "Si_gner e-poster (HTML tillatt):"
+#~ msgid "IMAP password"
+#~ msgstr "IMAP passord"
 
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "Lagring"
+#~ msgid "Encr_yption"
+#~ msgstr "Kryp_tering"
 
-#: ../ui/login.glade.h:35
-msgid "_Download mail"
-msgstr "_Last ned e-post"
+#~ msgid "Encrypt_ion"
+#~ msgstr "Krypter_ing"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "SMTP påloggingsinformasjon"
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "Brukernavn"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Husk passord"
+#~ msgid "No authentication re_quired"
+#~ msgstr "Ingen autentisering på_krevd"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Autentiser"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Bruk IMAP påloggings_informasjon"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Lese meldinger"
+#~ msgid "Composer"
+#~ msgstr "Skrive meldinger"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "Velg neste melding _automatisk"
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Lagre _utkast på tjener"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "_Forhåndsvisning av samtale"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "Si_gner e-poster (HTML tillatt):"
 
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr ""
+#~ msgid "Storage"
+#~ msgstr "Lagring"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "Aktiver _stavekontroll"
+#~ msgid "_Download mail"
+#~ msgstr "_Last ned e-post"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "Varslinger"
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP påloggingsinformasjon"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "_Spill varslingslyder"
+#~ msgid "Username"
+#~ msgstr "Brukernavn"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "Vis _varslinger for ny e-post"
+#~ msgid "_Remember password"
+#~ msgstr "_Husk passord"
 
-#: ../ui/preferences.glade.h:10
-msgid "Always _watch for new mail"
-msgstr "Alltid s_jekk for ny e-post"
+#~ msgid "_Authenticate"
+#~ msgstr "_Autentiser"
 
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr "Geary vil kjøre i bakgrunnen og melde i fra om ny e-post"
+#~ msgid "Reading"
+#~ msgstr "Lese meldinger"
 
-#: ../ui/preferences.glade.h:12
-msgid "Preferences"
-msgstr "Innstillinger"
+#~ msgid "_Automatically select next message"
+#~ msgstr "Velg neste melding _automatisk"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Er du sikker på at du vil fjerne denne "
-"kontoen?</span> "
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Forhåndsvisning av samtale"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"All e-post knyttet til denne kontoen vil bli fjernet fra datamaskinen. Dette "
-"vil ikke påvirke e-post på tjeneren."
+#~ msgid "Enable _spell checking"
+#~ msgstr "Aktiver _stavekontroll"
+
+#~ msgid "Notifications"
+#~ msgstr "Varslinger"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Spill varslingslyder"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Vis _varslinger for ny e-post"
+
+#~ msgid "Always _watch for new mail"
+#~ msgstr "Alltid s_jekk for ny e-post"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr "Geary vil kjøre i bakgrunnen og melde i fra om ny e-post"
+
+#~ msgid "Preferences"
+#~ msgstr "Innstillinger"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Er du sikker på at du vil fjerne denne "
+#~ "kontoen?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "All e-post knyttet til denne kontoen vil bli fjernet fra datamaskinen. Dette "
+#~ "vil ikke påvirke e-post på tjeneren."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Kallenavn:"
+#~ msgid "Nickname:"
+#~ msgstr "Kallenavn:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "E-postadresse:"
+#~ msgid "Email address:"
+#~ msgstr "E-postadresse:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Geary-oppdatering pågår..."
+#~ msgid "Geary update in progress…"
+#~ msgstr "Geary-oppdatering pågår..."
diff --git a/po/nl.po b/po/nl.po
index 660ef68..dc3d190 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -15,419 +15,438 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-08-04 20:47+0000\n"
-"PO-Revision-Date: 2014-08-23 12:20+0200\n"
-"Last-Translator: Hannie Dumoleyn <hannie ubuntu-nl org>\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:09+0000\n"
+"Last-Translator: Hannie Dumoleyn <Unknown>\n"
 "Language-Team: Dutch <vertaling vrijschrift org>\n"
-"geary/language/nl_NL/)\n"
-"Language: nl_NL\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: Lokalize 1.5\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-#| msgid "Geary Mail"
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "E-mailprogramma"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary Mail"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:54+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: nl_NL\n"
 
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "E-mail verzenden en ontvangen"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+#| msgid "Drafts"
+msgid "Drafts | Draft"
+msgstr "Concepten | Concept"
 
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Mail;"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr "Verzonden | Verzonden berichten | Verzonden e-mail"
 
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Bericht opstellen"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+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"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Opslaan"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Trash | Rubbish | Rubbish Bin | Prullenbak"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Toevoegen"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:19
-msgid "Accounts"
-msgstr "Accounts"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Postvak IN"
 
-#. Copyright 2011-2014 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Voornaam Achternaam"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Concepten"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-msgid "Welcome to Geary."
-msgstr "Welkom bij Geary."
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Verzonden berichten"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-msgid "Enter your account information to get started."
-msgstr "Vul uw accountgegevens in om te beginnen."
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Met ster"
 
-#: ../src/client/accounts/add-edit-page.vala:247
-msgid "2 weeks back"
-msgstr "Tot 2 weken geleden"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Belangrijk"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:248
-msgid "1 month back"
-msgstr "Tot 1 maand geleden"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Alle berichten"
 
-#: ../src/client/accounts/add-edit-page.vala:249
-msgid "3 months back"
-msgstr "Tot 3 maanden geleden"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Spam"
 
-#: ../src/client/accounts/add-edit-page.vala:250
-msgid "6 months back"
-msgstr "Tot 6 maanden geleden"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Prullenbak"
 
-#: ../src/client/accounts/add-edit-page.vala:251
-msgid "1 year back"
-msgstr "Tot 1 jaar geleden"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Postvak UIT"
 
-#: ../src/client/accounts/add-edit-page.vala:252
-#| msgid "1 year back"
-msgid "2 years back"
-msgstr "Tot 2 jaar geleden"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Zoeken"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-#| msgid "1 year back"
-msgid "4 years back"
-msgstr "Tot 4 jaar geleden"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Archiveren"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "Everything"
-msgstr "Alles"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Geen"
 
-#: ../src/client/accounts/add-edit-page.vala:686
-msgid "Remem_ber passwords"
-msgstr "_Wachtwoorden onthouden"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:693 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "Wachtwoord _onthouden"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:727
-msgid "Unable to validate:\n"
-msgstr "Verifiëren mislukt:\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:729
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Ongeldige accountbijnaam.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:732
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; E-mailadres is al aan Geary toegevoegd.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:736
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP-verbindingsfout.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Overige"
 
-#: ../src/client/accounts/add-edit-page.vala:739
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; IMAP-gebruikersnaam of -wachtwoord onjuist.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+#| msgid "Save A_ttachment..."
+#| msgid_plural "Save All A_ttachments..."
+msgid "attachment"
+msgstr "Bijlage"
 
-#: ../src/client/accounts/add-edit-page.vala:742
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP-verbindingsfout.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "bcc"
 
-#: ../src/client/accounts/add-edit-page.vala:745
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; SMTP-gebruikersnaam of -wachtwoord onjuist.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "inhoud"
 
-#: ../src/client/accounts/add-edit-page.vala:749
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Verbindingsfout.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+#| msgid "Bcc:"
+msgid "cc"
+msgstr "cc"
 
-#: ../src/client/accounts/add-edit-page.vala:753
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Gebruikersnaam of wachtwoord onjuist.\n"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "van"
 
-#: ../src/client/application/geary-application.vala:19
-#| msgid "Copyright 2011-2013 Yorba Foundation"
-msgid "Copyright 2011-2014 Yorba Foundation"
-msgstr "Copyright 2011-2014 Yorba Foundation"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+#| msgid "Subject:"
+msgid "subject"
+msgstr "Onderwerp"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "De Yorba-website bezoeken"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "aan"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Geary starten met verborgen hoofdvenster"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "ik"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Debuginformatie weergeven"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(geen onderwerp)"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Conversatiecontrole loggen"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %-e %b %Y om %-l:%M %p"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Netwerkdeserialisatie loggen"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "Op %1$s, schreef %2$s:"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Netwerkactiviteit loggen"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s schreef:"
 
-#. / 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 "IMAP-replaywachtrij loggen"
+#. / 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:234
+msgid "On %s:"
+msgstr "Op %s:"
 
-#. / 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 "Netwerkserialisatie loggen"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Doorgestuurd bericht ----------"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Periodieke activiteit loggen"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Van: %s\n"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Databasequery's loggen (genereert veel berichten)"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Onderwerp: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Mapnormalisatie loggen"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Datum: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Inspectie van WebView toestaan"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Aan: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Display program version"
-msgstr "Programmaversie weergeven"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Cc: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:49
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "%s gebruiken om een nieuw \"Nieuw bericht\"-venster te openen"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "geen"
 
-#: ../src/client/application/geary-args.vala:50
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Stuur opmerkingen, suggesties en bugs naar:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "E-mailprogramma"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:57
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Interpreteren van opdrachtregelopties mislukt: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
 
-#: ../src/client/application/geary-args.vala:68
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Onbekende opdrachtregeloptie ‘%s’\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "De Yorba-website bezoeken"
 
-#: ../src/client/application/geary-controller.vala:46
-msgid "_Delete"
-msgstr "_Verwijderen"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:47
+#: ../src/client/application/geary-controller.vala:62
 #| msgid "Delete conversation (Delete, Backspace, A)"
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Conversatie verwijderen (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:48
+#: ../src/client/application/geary-controller.vala:63
 #| msgid "Delete conversations (Delete, Backspace, A)"
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Conversaties verwijderen (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:52
-#| msgid "Trash"
-msgid "_Trash"
-msgstr "_Prullenbak"
-
-#: ../src/client/application/geary-controller.vala:53
-#| msgid "Archive conversations (Delete, Backspace, A)"
-msgid "Move conversation to trash (Delete, Backspace)"
-msgstr "Conversatie naar prullenbak verplaatsen (Delete, Backspace)"
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:54
-#| msgid "Archive conversations (Delete, Backspace, A)"
-msgid "Move conversations to trash (Delete, Backspace)"
-msgstr "Conversatie naar prullenbak verplaatsen (Delete, Backspace)"
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Archiveren"
 
-#: ../src/client/application/geary-controller.vala:59
+#: ../src/client/application/geary-controller.vala:73
 #| msgid "Move conversation"
 msgid "Archive conversation (A)"
 msgstr "Conversatie archiveren (A)"
 
-#: ../src/client/application/geary-controller.vala:60
+#: ../src/client/application/geary-controller.vala:74
 #| msgid "Move conversations"
 msgid "Archive conversations (A)"
 msgstr "Conversaties archiveren (A)"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Als S_pam markeren"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "S_pammarkering opheffen"
 
-#: ../src/client/application/geary-controller.vala:66
-#: ../src/client/application/geary-controller.vala:282
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Conversatie markeren"
 
-#: ../src/client/application/geary-controller.vala:67
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Conversaties markeren"
 
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Label aan conversatie toevoegen"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Label aan conversaties toevoegen"
 
-#: ../src/client/application/geary-controller.vala:70
-#: ../src/client/application/geary-controller.vala:321
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Conversatie verplaatsen"
 
-#: ../src/client/application/geary-controller.vala:71
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Conversaties verplaatsen"
 
-#: ../src/client/application/geary-controller.vala:258
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "A_ccounts"
 
-#: ../src/client/application/geary-controller.vala:263
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Voorkeuren"
 
-#: ../src/client/application/geary-controller.vala:267
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Help"
 
-#: ../src/client/application/geary-controller.vala:271
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Over"
 
-#: ../src/client/application/geary-controller.vala:275
-msgid "_Donate"
-msgstr "_Doneren"
-
-#: ../src/client/application/geary-controller.vala:279
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Afsluiten"
 
-#: ../src/client/application/geary-controller.vala:284
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Markeren als…"
 
-#: ../src/client/application/geary-controller.vala:290
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Markeren als _Gelezen"
 
-#: ../src/client/application/geary-controller.vala:296
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Markeren als _Ongelezen"
 
-#: ../src/client/application/geary-controller.vala:302
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Ster toevoegen"
 
-#: ../src/client/application/geary-controller.vala:307
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "Ster _verwijderen"
 
-#: ../src/client/application/geary-controller.vala:317
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Label toevoegen"
 
-#: ../src/client/application/geary-controller.vala:318
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Labelen"
 
-#: ../src/client/application/geary-controller.vala:322
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Verplaatsen"
 
-#: ../src/client/application/geary-controller.vala:326
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Nieuw bericht opstellen (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:330
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1574
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Beantwoorden"
 
-#: ../src/client/application/geary-controller.vala:331
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Beantwoorden (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "_Allen beantwoorden"
 
-#: ../src/client/application/geary-controller.vala:336
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Allen beantwoorden (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:341
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1584
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: ../src/client/application/geary-controller.vala:342
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Doorsturen (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:625
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:746
+msgid "Unable to store server trust exception"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Uw instellingen zijn onveilig"
 
-#: ../src/client/application/geary-controller.vala:626
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -437,17 +456,17 @@ msgstr ""
 "betekent dat uw gebruikersnaam en wachtwoord zichtbaar zijn voor anderen op "
 "uw netwerk. Weet u zeker dat u dit wilt doen?"
 
-#: ../src/client/application/geary-controller.vala:627
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "_Doorgaan"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:705
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "E-mail verzenden mislukt"
 
-#: ../src/client/application/geary-controller.vala:706
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -455,15 +474,13 @@ msgstr ""
 "Er is een fout opgetreden bij het verzenden van een e-mail. Als het probleem "
 "blijft bestaan, verwijder dan handmatig de e-mail in het Postvak Uit."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:710
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 #| msgid "Error sending email"
 msgid "Error saving sent mail"
 msgstr "Verzonden e-mail opslaan mislukt"
 
-#: ../src/client/application/geary-controller.vala:711
+#: ../src/client/application/geary-controller.vala:1069
 #| msgid ""
 #| "Geary encountered an error sending an email.  If the problem persists, "
 #| "please manually delete the email from your Outbox folder."
@@ -472,23 +489,17 @@ msgid ""
 "will stay in your Outbox folder until you delete it."
 msgstr ""
 "Er is een fout opgetreden bij het opslaan van een verzonden e-mailbericht. "
-"Het bericht "
-"zal in het Postvak Uit blijven staan totdat u het verwijdert."
+"Het bericht zal in het Postvak Uit blijven staan totdat u het verwijdert."
 
-#: ../src/client/application/geary-controller.vala:780
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Labels"
 
-#. give the user two options: reset the Account local store, or exit Geary.  A third
-#. could be done to leave the Account in an unopened state, but we don't currently
-#. have provisions for that.
-#: ../src/client/application/geary-controller.vala:792
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "De lokale database van %s kan niet geopend worden"
 
-#: ../src/client/application/geary-controller.vala:793
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -510,24 +521,21 @@ msgstr ""
 "afsluiten.⏎\n"
 "⏎\n"
 "Het opnieuw bouwen van de database verwijdert alle lokale e-mailberichten en "
-"bijlagen. "
-"<b>Mail op de server zal niet worden aangetast.</b>"
+"bijlagen. <b>Mail op de server zal niet worden aangetast.</b>"
 
-#: ../src/client/application/geary-controller.vala:795
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "_Opnieuw bouwen"
 
-#: ../src/client/application/geary-controller.vala:795
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "_Afsluiten"
 
-#: ../src/client/application/geary-controller.vala:804
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "De lokale database van ‘%s’ kan niet opnieuw gebouwd worden"
 
-#: ../src/client/application/geary-controller.vala:805
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -537,17 +545,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:827
-#: ../src/client/application/geary-controller.vala:837
-#: ../src/client/application/geary-controller.vala:848
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "De lokale postbus van %s kan niet geopend worden"
 
-#: ../src/client/application/geary-controller.vala:828
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -557,8 +561,8 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Er is een fout opgetreden bij het openen van de lokale e-maildatabase van dit "
-"account. Dit wordt waarschijnlijk veroorzaakt door een probleem met de "
+"Er is een fout opgetreden bij het openen van de lokale e-maildatabase van "
+"dit account. Dit wordt waarschijnlijk veroorzaakt door een probleem met de "
 "bestandsrechten. ⏎\n"
 "⏎\n"
 "Controleer of u voldoende lees/schrijfrechten hebt voor alle bestanden in "
@@ -566,7 +570,7 @@ msgstr ""
 "⏎\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:838
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -575,12 +579,12 @@ msgid ""
 "Please install the latest version of Geary and try again."
 msgstr ""
 "Het versienummer van de lokale e-maildatabase is opgemaakt voor een nieuwere "
-"versie van Geary. Het is helaas niet mogelijk de database \"terug te zetten\" "
-"zodat hij met deze versie van Geary werkt.\n"
+"versie van Geary. Het is helaas niet mogelijk de database \"terug te "
+"zetten\" zodat hij met deze versie van Geary werkt.\n"
 "\n"
 "Installeer de nieuwste versie van Geary en probeer het opnieuw."
 
-#: ../src/client/application/geary-controller.vala:849
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -592,23 +596,29 @@ msgstr ""
 "⏎\n"
 "Controleer uw netwerkverbinding en herstart Geary."
 
-#: ../src/client/application/geary-controller.vala:1356
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "Over %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1359
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
-msgstr "Bas Duineveld <basduineveld gmail com> "
+msgstr ""
+"Bas Duineveld <basduineveld gmail com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Hannie Dumoleyn https://launchpad.net/~lafeber-dumoleyn";
+
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1623
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Weet u zeker dat u ‘%s’ wilt openen?"
 
-#: ../src/client/application/geary-controller.vala:1624
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -616,518 +626,378 @@ msgstr ""
 "Bijlagen kunnen uw systeem schade toebrengen wanneer deze worden geopend. "
 "Open alleen bestanden van vertrouwde bronnen."
 
-#: ../src/client/application/geary-controller.vala:1625
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "_Niet opnieuw vragen"
 
-#: ../src/client/application/geary-controller.vala:1643
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Het bestand ‘%s’ bestaat al. Wilt u het vervangen?"
 
-#: ../src/client/application/geary-controller.vala:1645
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "Het bestand bestaat al in ‘%s’. Vervangen overschrijft de inhoud."
 
-#: ../src/client/application/geary-controller.vala:1648
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:1915
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Geopende conceptberichten sluiten?"
 
-#: ../src/client/application/geary-controller.vala:2024
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2489
 #| 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] "Wilt u dit bericht definitief verwijderen?"
 msgstr[1] "Wilt u deze berichten definitief verwijderen?"
 
-#: ../src/client/application/geary-controller.vala:2026
+#: ../src/client/application/geary-controller.vala:2491
 #| msgid "_Delete"
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-#| msgid "%i matches"
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i overeenkomst"
-msgstr[1] "%i overeenkomsten"
-
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-#| msgid "%i matches (wrapped)"
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i overeenkomst (voortgezet vanaf begin)"
-msgstr[1] "%i overeenkomsten (voortgezet vanaf begin)"
-
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "niet gevonden"
-
-#: ../src/client/components/main-toolbar.vala:11
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Zoeken"
-
-#. Search bar.
-#: ../src/client/components/main-toolbar.vala:78
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Trefwoorden zoeken in alle berichten van account (Ctrl+S)"
-
-#: ../src/client/components/main-toolbar.vala:212
-#, c-format
-msgid "Indexing %s account"
-msgstr "Bezig met indexeren van %s-account"
-
-#: ../src/client/components/main-toolbar.vala:223
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "%s-account doorzoeken"
-
-#: ../src/client/components/main-window.vala:320
-#, c-format
-#| msgid "%s (%s)"
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Verzenden…"
-
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
-#: ../src/client/components/stock.vala:19 ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Annuleren"
-
-#: ../src/client/components/stock.vala:23 ../ui/account_list.glade.h:4
-#: ../ui/preferences.glade.h:2
-msgid "_Close"
-msgstr "_Sluiten"
-
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Verwerpen"
-
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Openen"
-
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Afdrukken…"
-
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Verwijderen"
-
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1042
-msgid "Select _All"
-msgstr "_Alles selecteren"
-
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Behouden"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:57
-msgid "Saved"
-msgstr "Opgeslagen"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:58
-msgid "Saving"
-msgstr "Bezig met opslaan"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:59
-msgid "Error saving"
-msgstr "Opslaan mislukt"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Geary starten met verborgen hoofdvenster"
 
-#. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
-#: ../src/client/composer/composer-widget.vala:106
-msgid "attach|enclosed|enclosing|cover letter"
-msgstr "toevoegen | toegevoegd | bijlage | bijgevoegd"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Debuginformatie weergeven"
 
-#: ../src/client/composer/composer-widget.vala:823
-msgid "Do you want to discard the unsaved message?"
-msgstr "Wilt u het niet-opgeslagen bericht verwerpen?"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Conversatiecontrole loggen"
 
-#: ../src/client/composer/composer-widget.vala:826
-#: ../src/client/composer/composer-widget.vala:830
-msgid "Do you want to discard this message?"
-msgstr "Wilt u dit bericht verwerpen?"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Netwerkdeserialisatie loggen"
 
-#: ../src/client/composer/composer-widget.vala:911
-msgid "Send message with an empty subject and body?"
-msgstr "Bericht zonder onderwerp en inhoud verzenden?"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Netwerkactiviteit loggen"
 
-#: ../src/client/composer/composer-widget.vala:913
-msgid "Send message with an empty subject?"
-msgstr "Bericht zonder onderwerp verzenden?"
+#. / 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 "IMAP-replaywachtrij loggen"
 
-#: ../src/client/composer/composer-widget.vala:915
-msgid "Send message with an empty body?"
-msgstr "Bericht zonder inhoud verzenden?"
+#. / 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 "Netwerkserialisatie loggen"
 
-#: ../src/client/composer/composer-widget.vala:917
-msgid "Send message without an attachment?"
-msgstr "Bericht zonder bijlage verzenden?"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Periodieke activiteit loggen"
 
-#: ../src/client/composer/composer-widget.vala:1100
-msgid "Cannot add attachment"
-msgstr "Toevoegen van bijlage mislukt"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Databasequery's loggen (genereert veel berichten)"
 
-#: ../src/client/composer/composer-widget.vala:1111
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "‘%s’ kon niet worden gevonden."
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Mapnormalisatie loggen"
 
-#: ../src/client/composer/composer-widget.vala:1118
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "‘%s’ is een map."
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Inspectie van WebView toestaan"
 
-#: ../src/client/composer/composer-widget.vala:1125
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "‘%s’ is een leeg bestand."
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:1139
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "Leesfout bij openen van ‘%s’."
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Programmaversie weergeven"
 
-#: ../src/client/composer/composer-widget.vala:1146
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "‘%s’ is al toegevoegd voor verzending."
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "%s gebruiken om een nieuw \"Nieuw bericht\"-venster te openen"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1155
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Stuur opmerkingen, suggesties en bugs naar:"
 
-#: ../src/client/composer/composer-widget.vala:1215
-#| msgid "To: %s\n"
-msgid "To: "
-msgstr "Aan: "
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Interpreteren van opdrachtregelopties mislukt: %s\n"
 
-#: ../src/client/composer/composer-widget.vala:1218
-#| msgid "Cc: %s\n"
-msgid "Cc: "
-msgstr "Cc: "
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Onbekende opdrachtregeloptie ‘%s’\n"
 
-#: ../src/client/composer/composer-widget.vala:1221
-#| msgid "Bcc:"
-msgid "Bcc: "
-msgstr "Bcc: "
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Nieuwe berichten"
 
-#: ../src/client/composer/composer-widget.vala:1438
-msgid "Select Color"
-msgstr "Kleur selecteren"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d nieuw bericht"
+msgstr[1] "%d nieuwe berichten"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:1884
-#| msgid "From:"
-msgid "_From:"
-msgstr "_Van:"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, totaal %d nieuw bericht"
+msgstr[1] "%s, totaal %d nieuwe berichten"
 
-#. For other types of messages, just show the from account.
-#. Composer label (without mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:1900
-#: ../src/client/conversation-viewer/conversation-viewer.vala:635
-msgid "From:"
-msgstr "Van:"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d ander nieuw bericht voor %s)"
+msgstr[1] ""
+"%s\n"
+"(%d andere nieuwe berichten voor %s)"
 
-#. Copyright 2011-2014 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Window for sending messages.
-#: ../src/client/composer/composer-window.vala:10
-msgid "New Message"
-msgstr "Nieuw bericht"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Openen"
 
 #: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Ik"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:260
-msgid "No conversations selected."
-msgstr "Geen conversaties geselecteerd."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:262
-#, c-format
-#| msgid "%u conversations selected."
-msgid "%u conversation selected."
-msgid_plural "%u conversations selected."
-msgstr[0] "%u conversatie geselecteerd."
-msgstr[1] "%u conversaties geselecteerd."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:291
-msgid "No search results found."
-msgstr "Geen zoekresultaten gevonden."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:293
-msgid "No conversations in folder."
-msgstr "Geen conversaties in map."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:534
-msgid "This message contains remote images."
-msgstr "Dit bericht bevat externe afbeeldingen."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:534
-msgid "Show Images"
-msgstr "Afbeeldingen tonen"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:535
-msgid "Always Show From Sender"
-msgstr "Laat altijd \"Van verzender\" zien"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:559
-msgid "Edit Draft"
-msgstr "Concept bewerken"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:638
-msgid "To:"
-msgstr "Aan:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:641
-msgid "Cc:"
-msgstr "Cc:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:644
-msgid "Bcc:"
-msgstr "Bcc:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:647
-msgid "Subject:"
-msgstr "Onderwerp:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:650
-msgid "Date:"
-msgstr "Datum:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:857
-#, c-format
-#| msgid "%u read messages"
-msgid "%u read message"
-msgid_plural "%u read messages"
-msgstr[0] "%u gelezen bericht"
-msgstr[1] "%u gelezen berichten"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:989
-#, c-format
-msgid "This message was sent successfully, but could not be saved to %s."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
 msgstr ""
-"Dit bericht is met succes verzonden, maar kon niet worden opgeslagen in %s."
 
-#. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1015
-#: ../ui/composer.glade.h:4
-msgid "_Copy"
-msgstr "_Kopiëren"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr ""
 
-#. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1023
-msgid "Copy _Email Address"
-msgstr "_E-mailadres kopiëren"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr ""
 
-#. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1028
-#: ../ui/composer.glade.h:17
-msgid "Copy _Link"
-msgstr "_Koppeling kopiëren"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr ""
 
-#. Select message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1036
-msgid "Select _Message"
-msgstr "_Bericht selecteren"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Een bestand kiezen"
 
-#. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1048
-msgid "_Inspect"
-msgstr "_Inspecteren"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Toevoegen"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1274
-msgid "This link appears to go to"
-msgstr "Deze koppeling lijkt te leiden naar"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1275
-msgid "but actually goes to"
-msgstr "maar gaat daadwerkelijk naar"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Accounts"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
-msgid " (Invalid?)"
-msgstr "(Ongeldig?)"
+#. / 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 "Voornaam Achternaam"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1522
-msgid "_Save As..."
-msgstr "_Opslaan als…"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Welkom bij Geary."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1527
-msgid "Save All A_ttachments..."
-msgstr "Alle _bijlagen opslaan…"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Vul uw accountgegevens in om te beginnen."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1541
-msgid "_Save Image As..."
-msgstr "_Afbeelding opslaan als…"
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "Tot 2 weken geleden"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1564
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "_Bijlage opslaan…"
-msgstr[1] "Alle _bijlagen opslaan"
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "Tot 1 maand geleden"
 
-#. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1579
-msgid "Reply to _All"
-msgstr "_Allen beantwoorden"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "Tot 3 maanden geleden"
 
-#. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1596
-msgid "_Mark as Read"
-msgstr "Als gelezen _markeren"
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "Tot 6 maanden geleden"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1600
-msgid "_Mark as Unread"
-msgstr "Als ongelezen _markeren"
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "Tot 1 jaar geleden"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1606
-msgid "Mark Unread From _Here"
-msgstr "Als Ongelezen vanaf _hier markeren"
+#: ../src/client/accounts/add-edit-page.vala:258
+#| msgid "1 year back"
+msgid "2 years back"
+msgstr "Tot 2 jaar geleden"
 
-#. Separator.
-#. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1621
-msgid "_View Source"
-msgstr "_Bron weergeven"
+#: ../src/client/accounts/add-edit-page.vala:259
+#| msgid "1 year back"
+msgid "4 years back"
+msgstr "Tot 4 jaar geleden"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1915
-#: ../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "geen"
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Alles"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2045
-msgid "Failed to open default text editor."
-msgstr "Openen van standaard tekstverwerker mislukt."
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-web-view.vala:321
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - Conversatie-controleur"
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Een bestand kiezen"
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "_Wachtwoorden onthouden"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Toevoegen"
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "Wachtwoord _onthouden"
 
-#. 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 "Please enter your password"
-msgstr "Voer uw wachtwoord in"
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Verifiëren mislukt:\n"
 
-#. 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 bericht"
-msgstr[1] "%d berichten"
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Ongeldige accountbijnaam.\n"
 
-#. / 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 ongelezen"
-msgstr[1] "%d ongelezen"
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; E-mailadres is al aan Geary toegevoegd.\n"
 
-#. / 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/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; IMAP-verbindingsfout.\n"
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Postvakken IN"
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; IMAP-gebruikersnaam of -wachtwoord onjuist.\n"
 
-#: ../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 resultaat"
-msgstr[1] "%d resultaten"
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; SMTP-verbindingsfout.\n"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Nieuwe berichten"
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; SMTP-gebruikersnaam of -wachtwoord onjuist.\n"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d nieuw bericht"
-msgstr[1] "%d nieuwe berichten"
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Verbindingsfout.\n"
 
-#: ../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] "%s, totaal %d nieuw bericht"
-msgstr[1] "%s, totaal %d nieuwe berichten"
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Gebruikersnaam of wachtwoord onjuist.\n"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 ander nieuw bericht voor %s)"
-msgstr[1] ""
-"%s\n"
-"(%d andere nieuwe berichten voor %s)"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Opslaan"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Openen"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Toevoegen"
 
 #. / 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
@@ -1185,7 +1055,6 @@ msgid "Now"
 msgstr "Nu"
 
 #: ../src/client/util/util-date.vala:167
-#, c-format
 #| msgid "%dm ago"
 msgid "%dm ago"
 msgid_plural "%dm ago"
@@ -1193,7 +1062,6 @@ msgstr[0] "%dm geleden"
 msgstr[1] "%dm geleden"
 
 #: ../src/client/util/util-date.vala:171
-#, c-format
 #| msgid "%dh ago"
 msgid "%dh ago"
 msgid_plural "%dh ago"
@@ -1207,15 +1075,9 @@ msgstr "Gisteren"
 #. / 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:30
-#: ../src/engine/rfc822/rfc822-message.vala:741
-msgid "(no subject)"
-msgstr "(geen onderwerp)"
-
 #: ../src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "bytes"
@@ -1240,686 +1102,783 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KB"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d bericht"
+msgstr[1] "%d berichten"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d ongelezen"
+msgstr[1] "%d ongelezen"
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Overige"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Postvakken IN"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Postvak IN"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "%s-account doorzoeken"
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Concepten"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+#| msgid "%d results"
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d resultaat"
+msgstr[1] "%d resultaten"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Verzonden berichten"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "Geen conversaties geselecteerd."
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Met ster"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+#| msgid "%u conversations selected."
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] "%u conversatie geselecteerd."
+msgstr[1] "%u conversaties geselecteerd."
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Belangrijk"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
+msgstr "Geen zoekresultaten gevonden."
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Alle berichten"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
+msgstr "Geen conversaties in map."
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Spam"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
+msgstr "Dit bericht bevat externe afbeeldingen."
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Prullenbak"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr "Afbeeldingen tonen"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Postvak UIT"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
+msgstr "Laat altijd \"Van verzender\" zien"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Archiveren"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
+msgstr "Concept bewerken"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:25
-msgid "None"
-msgstr "Geen"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "Van:"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.
-#: ../src/engine/imap-db/imap-db-account.vala:662
-#| msgid "Save A_ttachment..."
-#| msgid_plural "Save All A_ttachments..."
-msgid "attachment"
-msgstr "Bijlage"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "Aan:"
 
-#. / Can be typed in the search box like bcc:johndoe example com to find
-#. / messages bcc'd to a particular person.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:665
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "bcc"
-msgstr "bcc"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Cc:"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:668
-msgid "body"
-msgstr "inhoud"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Bcc:"
 
-#. / Can be typed in the search box like cc:johndoe example com to find
-#. / messages cc'd to a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:671
-#: ../src/engine/imap-db/imap-db-account.vala:684
-#| msgid "Bcc:"
-msgid "cc"
-msgstr "cc"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "Onderwerp:"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.
-#: ../src/engine/imap-db/imap-db-account.vala:674
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "from"
-msgstr "van"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Datum:"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:677
-#| msgid "Subject:"
-msgid "subject"
-msgstr "Onderwerp"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+#| msgid "%u read messages"
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] "%u gelezen bericht"
+msgstr[1] "%u gelezen berichten"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:680
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "to"
-msgstr "aan"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
+msgstr ""
+"Dit bericht is met succes verzonden, maar kon niet worden opgeslagen in %s."
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.
-#: ../src/engine/imap-db/imap-db-account.vala:699
-msgid "me"
-msgstr "ik"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "_Kopiëren"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:535
-#| msgid "Drafts"
-msgid "Drafts | Draft"
-msgstr "Concepten | Concept"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "_E-mailadres kopiëren"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:540
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "Verzonden | Verzonden berichten | Verzonden e-mail"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "_Koppeling kopiëren"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:545
-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"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
+msgstr "_Bericht selecteren"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:550
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Trash | Rubbish | Rubbish Bin | Prullenbak"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "_Alles selecteren"
 
-#. / 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 om %-l:%M %p"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "_Inspecteren"
 
-#. / 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 "Op %1$s, schreef %2$s:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr "Deze koppeling lijkt te leiden naar"
 
-#. / 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 schreef:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
+msgstr "maar gaat daadwerkelijk naar"
 
-#. / 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 "Op %s:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
+msgstr " (Ongeldig?)"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Doorgestuurd bericht ----------"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
+msgstr "_Afbeelding opslaan als…"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "Van: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_Opslaan als…"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Onderwerp: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "Alle _bijlagen opslaan…"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "Datum: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] "_Bijlage opslaan…"
+msgstr[1] "Alle _bijlagen opslaan"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "Aan: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "_Allen beantwoorden"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Cc: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "Als gelezen _markeren"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "Als ongelezen _markeren"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
+msgstr "Als Ongelezen vanaf _hier markeren"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "_Bron weergeven"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "Openen van standaard tekstverwerker mislukt."
+
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr "%s - Conversatie-controleur"
+
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Opgeslagen"
+
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Bezig met opslaan"
+
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Opslaan mislukt"
+
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Account verwijderen mislukt</span> "
 
-#: ../ui/account_cannot_remove.glade.h:2
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Nieuw bericht"
+
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Vanuit dit account wordt momenteel een bericht opgesteld. Verstuur of "
-"verwerp dit bericht en probeer het opnieuw."
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Account toevoegen"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Wilt u dit bericht verwerpen?"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Account bewerken"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Bericht zonder onderwerp en inhoud verzenden?"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Account verwijderen"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Bericht zonder onderwerp verzenden?"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Even geduld, Geary verifieert uw account."
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Bericht zonder inhoud verzenden?"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "O_ngedaan maken"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Bericht zonder bijlage verzenden?"
 
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Opnieuw"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Toevoegen van bijlage mislukt"
 
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "_Knippen"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "‘%s’ kon niet worden gevonden."
 
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "_Plakken"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "‘%s’ is een map."
 
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Links"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "‘%s’ is een leeg bestand."
 
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Rechts"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "Leesfout bij openen van ‘%s’."
 
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Midden"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "‘%s’ is al toegevoegd voor verzending."
 
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Uitlijnen"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Koppeling (Ctrl+L)"
+#: ../src/client/composer/composer-widget.vala:1645
+#| msgid "To: %s\n"
+msgid "To: "
+msgstr "Aan: "
 
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "K_leur"
+#: ../src/client/composer/composer-widget.vala:1648
+#| msgid "Cc: %s\n"
+msgid "Cc: "
+msgstr "Cc: "
 
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Meer opties"
+#: ../src/client/composer/composer-widget.vala:1651
+#| msgid "Bcc:"
+msgid "Bcc: "
+msgstr "Bcc: "
 
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Citaat (Ctrl+])"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr ""
 
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Einde citaat (Ctrl+[)"
-
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Opmaak verwijderen (Ctrl+Space)"
-
-#: ../ui/composer.glade.h:16
-#| msgid "Paste _With Formatting"
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Plakken met _opmaak"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Vet (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Cursief (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Onderstrepen (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Doorstrepen (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "Opge_maakte tekst"
-
-#: ../ui/composer.glade.h:23
-msgid "Lar_ge"
-msgstr "_Groot"
-
-#: ../ui/composer.glade.h:24
-msgid "Large"
-msgstr "Groot"
-
-#: ../ui/composer.glade.h:25
-msgid "_Medium"
-msgstr "_Middel"
-
-#: ../ui/composer.glade.h:26
-msgid "Medium"
-msgstr "Middel"
-
-#: ../ui/composer.glade.h:27
-msgid "_Small"
-msgstr "_Klein"
-
-#: ../ui/composer.glade.h:28
-msgid "Small"
-msgstr "Klein"
-
-#: ../ui/composer.glade.h:29
-msgid "S_ans Serif"
-msgstr "_Schreefloos"
-
-#: ../ui/composer.glade.h:30
-msgid "Sans Serif"
-msgstr "Schreefloos"
-
-#: ../ui/composer.glade.h:31
-msgid "S_erif"
-msgstr "_Met schreef"
-
-#: ../ui/composer.glade.h:32
-msgid "Serif"
-msgstr "Met schreef"
-
-#: ../ui/composer.glade.h:33
-msgid "_Fixed Width"
-msgstr "_Vaste breedte"
-
-#: ../ui/composer.glade.h:34
-msgid "Fixed Width"
-msgstr "Vaste breedte"
-
-#: ../ui/composer.glade.h:35
-#| msgid "_Attach"
-msgid "Detach"
-msgstr "Ontkoppelen"
-
-#: ../ui/composer.glade.h:36
-msgid "_Send"
-msgstr "_Verzenden"
-
-#: ../ui/composer.glade.h:37
-#| msgid "_Send"
-msgid "Send"
-msgstr "Verzenden"
-
-#: ../ui/composer.glade.h:38
-msgid "_Attach File"
-msgstr "_Bestand toevoegen"
-
-#: ../ui/composer.glade.h:39
-#| msgid "_Attach File"
-msgid "Attach File"
-msgstr "_Bestand toevoegen"
-
-#: ../ui/composer.glade.h:40
-msgid "_Include Original Attachments"
-msgstr "_Originele bijlagen toevoegen"
-
-#: ../ui/composer.glade.h:41
-#| msgid "_Include Original Attachments"
-msgid "Include Original Attachments"
-msgstr "Originele bijlagen toevoegen"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:43
-#| msgid "To:"
-msgid "_To"
-msgstr "_Aan"
-
-#: ../ui/composer.glade.h:44
-#| msgid "Cc:"
-msgid "_Cc"
-msgstr "_Cc"
-
-#: ../ui/composer.glade.h:45
-#| msgid "Subject:"
-msgid "_Subject"
-msgstr "_Onderwerp"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Kleur selecteren"
 
-#: ../ui/composer.glade.h:46
-msgid "_Bcc"
-msgstr "_Bcc"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr ""
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:48
+#: ../src/client/composer/composer-widget.vala:2364
 #| msgid "From:"
-msgid "From"
-msgstr "Van"
-
-#: ../ui/composer.glade.h:49
-msgid "Drop files here"
-msgstr "Bestanden hierheen neerzetten"
-
-#: ../ui/composer.glade.h:50
-msgid "To add them as attachments"
-msgstr "Om ze als bijlage toe te voegen"
-
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Zoeken:"
-
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Vorige"
-
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_volgende"
-
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Hoofdlettergevoelig"
-
-#: ../ui/find_bar.glade.h:5
-#| msgid "Labels"
-msgid "label"
-msgstr "Label"
-
-#: ../ui/login.glade.h:1
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: ../ui/login.glade.h:2
-#| msgid "E_mail address:"
-msgid "E_mail address"
-msgstr "_E-mailadres"
-
-#: ../ui/login.glade.h:3
-#| msgid "_Password:"
-msgid "_Password"
-msgstr "_Wachtwoord"
-
-#: ../ui/login.glade.h:4
-#| msgid "S_ervice:"
-msgid "S_ervice"
-msgstr "_Service"
-
-#: ../ui/login.glade.h:5
-#| msgid "N_ame:"
-msgid "N_ame"
-msgstr "_Naam"
-
-#: ../ui/login.glade.h:7
-#| msgid "N_ickname:"
-msgid "N_ickname"
-msgstr "B_ijnaam"
-
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Werk, Thuis, etc."
-
-#: ../ui/login.glade.h:9
-#| msgid "Sent Mail"
-msgid "_Save sent mail"
-msgstr "Verzonden berichten _opslaan"
-
-#: ../ui/login.glade.h:10
-msgid "IMAP settings"
-msgstr "IMAP-instellingen"
-
-#: ../ui/login.glade.h:11
-#| msgid "Se_rver:"
-msgid "Se_rver"
-msgstr "_Server"
-
-#: ../ui/login.glade.h:12
-#| msgid "P_ort:"
-msgid "P_ort"
-msgstr "_Poort"
-
-#: ../ui/login.glade.h:13
-#| msgid "Ser_ver:"
-msgid "Ser_ver"
-msgstr "Se_rver"
-
-#: ../ui/login.glade.h:14
-#| msgid "Por_t:"
-msgid "Por_t"
-msgstr "Poor_t"
-
-#: ../ui/login.glade.h:15
-msgid "SMTP settings"
-msgstr "SMTP-instellingen"
-
-#: ../ui/login.glade.h:16
-#| msgid "User_name:"
-msgid "User_name"
-msgstr "Ge_bruikersnaam"
-
-#: ../ui/login.glade.h:17
-#| msgid "Pass_word:"
-msgid "Pass_word"
-msgstr "Wa_chtwoord"
-
-#: ../ui/login.glade.h:18
-msgid "SMTP username"
-msgstr "SMTP-gebruikersnaam"
-
-#: ../ui/login.glade.h:19
-msgid "SMTP password"
-msgstr "SMTP-wachtwoord"
-
-#: ../ui/login.glade.h:20
-#| msgid "_Username:"
-msgid "_Username"
-msgstr "_Gebruikersnaam"
-
-#: ../ui/login.glade.h:21
-msgid "IMAP username"
-msgstr "IMAP-gebruikersnaam"
-
-#: ../ui/login.glade.h:22
-msgid "IMAP password"
-msgstr "IMAP-wachtwoord"
-
-#: ../ui/login.glade.h:23
-#| msgid "Encr_yption:"
-msgid "Encr_yption"
-msgstr "_Versleuteling"
-
-#: ../ui/login.glade.h:24
-#| msgid "Encrypt_ion:"
-msgid "Encrypt_ion"
-msgstr "Ver_sleuteling"
-
-#: ../ui/login.glade.h:26
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
-
-#: ../ui/login.glade.h:27
-msgid "STARTTLS"
-msgstr "STARTTLS"
-
-#: ../ui/login.glade.h:28
-msgid "No authentication re_quired"
-msgstr "Geen authenticatie ve_reist"
-
-#: ../ui/login.glade.h:29
-#| msgid "IMAP Credentials"
-msgid "Use IMAP cre_dentials"
-msgstr "IMAP-inlog_gegevens gebruiken"
-
-#: ../ui/login.glade.h:30
-msgid "Storage"
-msgstr "Opslag"
-
-#: ../ui/login.glade.h:31
-#| msgid "_Download mail:"
-msgid "_Download mail"
-msgstr "Berichten _downloaden"
-
-#: ../ui/login.glade.h:32 ../ui/preferences.glade.h:6
-msgid "Composer"
-msgstr "Opstelvenster"
-
-#: ../ui/login.glade.h:33
-msgid "Save dra_fts on server"
-msgstr "Concepten opslaan op server"
-
-#: ../ui/login.glade.h:34
-msgid "Si_gn emails:"
-msgstr "Berichten o_ndertekenen:"
-
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "SMTP-inloggegevens"
-
-#: ../ui/password-dialog.glade.h:2
-msgid "Username:"
-msgstr "Gebruikersnaam:"
-
-#: ../ui/password-dialog.glade.h:3
-msgid "Password:"
-msgstr "Wachtwoord:"
-
-#: ../ui/password-dialog.glade.h:4
-#| msgid "_Remember passwords"
-msgid "_Remember password"
-msgstr "_Wachtwoord onthouden"
-
-#: ../ui/preferences.glade.h:1
-#| msgid "_Preferences"
-msgid "Preferences"
-msgstr "Voorkeuren"
-
-#: ../ui/preferences.glade.h:3
-msgid "Reading"
-msgstr "Leesvenster"
-
-#: ../ui/preferences.glade.h:4
-msgid "_Automatically select next message"
-msgstr "_Automatisch volgende bericht selecteren"
-
-#: ../ui/preferences.glade.h:5
-msgid "_Display conversation preview"
-msgstr "_Berichtvoorbeeld weergeven"
-
-#: ../ui/preferences.glade.h:7
-msgid "Enable _spell checking"
-msgstr "Spellings_controle inschakelen"
-
-#: ../ui/preferences.glade.h:8
-msgid "Notifications"
-msgstr "Meldingen"
-
-#: ../ui/preferences.glade.h:9
-msgid "_Play notification sounds"
-msgstr "_Geluid afspelen bij melding"
-
-#: ../ui/preferences.glade.h:10
-msgid "Show _notifications for new mail"
-msgstr "_Melding weergeven voor nieuwe e-mail"
-
-#: ../ui/preferences.glade.h:11
-msgid "Notify of new mail at start_up"
-msgstr "Melden van nieuwe berichten bij _opstarten"
-
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Weet u zeker dat u dit account wilt "
-"verwijderen?</span> "
+msgid "_From:"
+msgstr "_Van:"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Dit account wordt met alle bijbehorende berichten van uw computer "
-"verwijderd. Dit heeft geen invloed op berichten op de server."
+#: ../src/client/components/main-window.vala:388
+#| msgid "%s (%s)"
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Verzenden…"
+
+#: ../src/client/components/conversation-find-bar.vala:214
+#| msgid "%i matches"
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i overeenkomst"
+msgstr[1] "%i overeenkomsten"
+
+#: ../src/client/components/conversation-find-bar.vala:216
+#| msgid "%i matches (wrapped)"
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i overeenkomst (voortgezet vanaf begin)"
+msgstr[1] "%i overeenkomsten (voortgezet vanaf begin)"
+
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "niet gevonden"
+
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_OK"
+
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Annuleren"
+
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Sluiten"
+
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Verwerpen"
+
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Openen"
+
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Afdrukken…"
+
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Verwijderen"
+
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Behouden"
+
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Trefwoorden zoeken in alle berichten van account (Ctrl+S)"
+
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Bezig met indexeren van %s-account"
+
+#~| msgid "Geary Mail"
+#~ msgid "Geary"
+#~ msgstr "Geary"
+
+#~ msgid "Geary Mail"
+#~ msgstr "Geary Mail"
+
+#~ msgid "Send and receive email"
+#~ msgstr "E-mail verzenden en ontvangen"
+
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Email;E-mail;Mail;"
+
+#~ msgid "Compose Message"
+#~ msgstr "Bericht opstellen"
+
+#~| msgid "Copyright 2011-2013 Yorba Foundation"
+#~ msgid "Copyright 2011-2014 Yorba Foundation"
+#~ msgstr "Copyright 2011-2014 Yorba Foundation"
+
+#~ msgid "_Delete"
+#~ msgstr "_Verwijderen"
+
+#~| msgid "Trash"
+#~ msgid "_Trash"
+#~ msgstr "_Prullenbak"
+
+#~| msgid "Archive conversations (Delete, Backspace, A)"
+#~ msgid "Move conversation to trash (Delete, Backspace)"
+#~ msgstr "Conversatie naar prullenbak verplaatsen (Delete, Backspace)"
+
+#~| msgid "Archive conversations (Delete, Backspace, A)"
+#~ msgid "Move conversations to trash (Delete, Backspace)"
+#~ msgstr "Conversatie naar prullenbak verplaatsen (Delete, Backspace)"
+
+#~ msgid "_Donate"
+#~ msgstr "_Doneren"
+
+#~ msgid "attach|enclosed|enclosing|cover letter"
+#~ msgstr "toevoegen | toegevoegd | bijlage | bijgevoegd"
+
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Wilt u het niet-opgeslagen bericht verwerpen?"
+
+#~| msgid "Please enter your email password"
+#~ msgid "Please enter your password"
+#~ msgstr "Voer uw wachtwoord in"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Account verwijderen mislukt</span> "
+
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Vanuit dit account wordt momenteel een bericht opgesteld. Verstuur of "
+#~ "verwerp dit bericht en probeer het opnieuw."
+
+#~ msgid "Add account"
+#~ msgstr "Account toevoegen"
+
+#~ msgid "Edit account"
+#~ msgstr "Account bewerken"
+
+#~ msgid "Remove account"
+#~ msgstr "Account verwijderen"
+
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Even geduld, Geary verifieert uw account."
+
+#~ msgid "_Undo"
+#~ msgstr "O_ngedaan maken"
+
+#~ msgid "_Redo"
+#~ msgstr "_Opnieuw"
+
+#~ msgid "Cu_t"
+#~ msgstr "_Knippen"
+
+#~ msgid "_Paste"
+#~ msgstr "_Plakken"
+
+#~ msgid "_Left"
+#~ msgstr "_Links"
+
+#~ msgid "_Right"
+#~ msgstr "_Rechts"
+
+#~ msgid "_Center"
+#~ msgstr "_Midden"
+
+#~ msgid "_Justify"
+#~ msgstr "_Uitlijnen"
+
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Koppeling (Ctrl+L)"
+
+#~ msgid "C_olor"
+#~ msgstr "K_leur"
+
+#~ msgid "More options"
+#~ msgstr "Meer opties"
+
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Citaat (Ctrl+])"
+
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Einde citaat (Ctrl+[)"
+
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Opmaak verwijderen (Ctrl+Space)"
+
+#~| msgid "Paste _With Formatting"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Plakken met _opmaak"
+
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Vet (Ctrl+B)"
+
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Cursief (Ctrl+I)"
+
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Onderstrepen (Ctrl+U)"
+
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Doorstrepen (Ctrl+K)"
+
+#~ msgid "_Rich Text"
+#~ msgstr "Opge_maakte tekst"
+
+#~ msgid "Lar_ge"
+#~ msgstr "_Groot"
+
+#~ msgid "Large"
+#~ msgstr "Groot"
+
+#~ msgid "_Medium"
+#~ msgstr "_Middel"
+
+#~ msgid "Medium"
+#~ msgstr "Middel"
+
+#~ msgid "_Small"
+#~ msgstr "_Klein"
+
+#~ msgid "Small"
+#~ msgstr "Klein"
+
+#~ msgid "S_ans Serif"
+#~ msgstr "_Schreefloos"
+
+#~ msgid "Sans Serif"
+#~ msgstr "Schreefloos"
+
+#~ msgid "S_erif"
+#~ msgstr "_Met schreef"
+
+#~ msgid "Serif"
+#~ msgstr "Met schreef"
+
+#~ msgid "_Fixed Width"
+#~ msgstr "_Vaste breedte"
+
+#~ msgid "Fixed Width"
+#~ msgstr "Vaste breedte"
+
+#~| msgid "_Attach"
+#~ msgid "Detach"
+#~ msgstr "Ontkoppelen"
+
+#~ msgid "_Send"
+#~ msgstr "_Verzenden"
+
+#~| msgid "_Send"
+#~ msgid "Send"
+#~ msgstr "Verzenden"
+
+#~ msgid "_Attach File"
+#~ msgstr "_Bestand toevoegen"
+
+#~| msgid "_Attach File"
+#~ msgid "Attach File"
+#~ msgstr "_Bestand toevoegen"
+
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Originele bijlagen toevoegen"
+
+#~| msgid "_Include Original Attachments"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Originele bijlagen toevoegen"
+
+#~| msgid "To:"
+#~ msgid "_To"
+#~ msgstr "_Aan"
+
+#~| msgid "Cc:"
+#~ msgid "_Cc"
+#~ msgstr "_Cc"
+
+#~| msgid "Subject:"
+#~ msgid "_Subject"
+#~ msgstr "_Onderwerp"
+
+#~ msgid "_Bcc"
+#~ msgstr "_Bcc"
+
+#~| msgid "From:"
+#~ msgid "From"
+#~ msgstr "Van"
+
+#~ msgid "Drop files here"
+#~ msgstr "Bestanden hierheen neerzetten"
+
+#~ msgid "To add them as attachments"
+#~ msgstr "Om ze als bijlage toe te voegen"
+
+#~ msgid "Find:"
+#~ msgstr "Zoeken:"
+
+#~ msgid "_Previous"
+#~ msgstr "_Vorige"
+
+#~ msgid "_Next"
+#~ msgstr "_volgende"
+
+#~ msgid "_Case sensitive"
+#~ msgstr "_Hoofdlettergevoelig"
+
+#~| msgid "Labels"
+#~ msgid "label"
+#~ msgstr "Label"
+
+#~ msgid "Password"
+#~ msgstr "Wachtwoord"
+
+#~| msgid "E_mail address:"
+#~ msgid "E_mail address"
+#~ msgstr "_E-mailadres"
+
+#~| msgid "_Password:"
+#~ msgid "_Password"
+#~ msgstr "_Wachtwoord"
+
+#~| msgid "S_ervice:"
+#~ msgid "S_ervice"
+#~ msgstr "_Service"
+
+#~| msgid "N_ame:"
+#~ msgid "N_ame"
+#~ msgstr "_Naam"
+
+#~| msgid "N_ickname:"
+#~ msgid "N_ickname"
+#~ msgstr "B_ijnaam"
+
+#~ msgid "Work, Home, etc."
+#~ msgstr "Werk, Thuis, etc."
+
+#~| msgid "Sent Mail"
+#~ msgid "_Save sent mail"
+#~ msgstr "Verzonden berichten _opslaan"
+
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP-instellingen"
+
+#~| msgid "Se_rver:"
+#~ msgid "Se_rver"
+#~ msgstr "_Server"
+
+#~| msgid "P_ort:"
+#~ msgid "P_ort"
+#~ msgstr "_Poort"
+
+#~| msgid "Ser_ver:"
+#~ msgid "Ser_ver"
+#~ msgstr "Se_rver"
+
+#~| msgid "Por_t:"
+#~ msgid "Por_t"
+#~ msgstr "Poor_t"
+
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP-instellingen"
+
+#~| msgid "User_name:"
+#~ msgid "User_name"
+#~ msgstr "Ge_bruikersnaam"
+
+#~| msgid "Pass_word:"
+#~ msgid "Pass_word"
+#~ msgstr "Wa_chtwoord"
+
+#~ msgid "SMTP username"
+#~ msgstr "SMTP-gebruikersnaam"
+
+#~ msgid "SMTP password"
+#~ msgstr "SMTP-wachtwoord"
+
+#~| msgid "_Username:"
+#~ msgid "_Username"
+#~ msgstr "_Gebruikersnaam"
+
+#~ msgid "IMAP username"
+#~ msgstr "IMAP-gebruikersnaam"
+
+#~ msgid "IMAP password"
+#~ msgstr "IMAP-wachtwoord"
+
+#~| msgid "Encr_yption:"
+#~ msgid "Encr_yption"
+#~ msgstr "_Versleuteling"
+
+#~| msgid "Encrypt_ion:"
+#~ msgid "Encrypt_ion"
+#~ msgstr "Ver_sleuteling"
+
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
+
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
+
+#~ msgid "No authentication re_quired"
+#~ msgstr "Geen authenticatie ve_reist"
+
+#~| msgid "IMAP Credentials"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "IMAP-inlog_gegevens gebruiken"
+
+#~ msgid "Storage"
+#~ msgstr "Opslag"
+
+#~| msgid "_Download mail:"
+#~ msgid "_Download mail"
+#~ msgstr "Berichten _downloaden"
+
+#~ msgid "Composer"
+#~ msgstr "Opstelvenster"
+
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Concepten opslaan op server"
+
+#~ msgid "Si_gn emails:"
+#~ msgstr "Berichten o_ndertekenen:"
+
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP-inloggegevens"
+
+#~ msgid "Username:"
+#~ msgstr "Gebruikersnaam:"
+
+#~ msgid "Password:"
+#~ msgstr "Wachtwoord:"
+
+#~| msgid "_Remember passwords"
+#~ msgid "_Remember password"
+#~ msgstr "_Wachtwoord onthouden"
+
+#~| msgid "_Preferences"
+#~ msgid "Preferences"
+#~ msgstr "Voorkeuren"
+
+#~ msgid "Reading"
+#~ msgstr "Leesvenster"
+
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Automatisch volgende bericht selecteren"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Berichtvoorbeeld weergeven"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Spellings_controle inschakelen"
+
+#~ msgid "Notifications"
+#~ msgstr "Meldingen"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Geluid afspelen bij melding"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "_Melding weergeven voor nieuwe e-mail"
+
+#~ msgid "Notify of new mail at start_up"
+#~ msgstr "Melden van nieuwe berichten bij _opstarten"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Weet u zeker dat u dit account wilt "
+#~ "verwijderen?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Dit account wordt met alle bijbehorende berichten van uw computer "
+#~ "verwijderd. Dit heeft geen invloed op berichten op de server."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Bijnaam:"
+#~ msgid "Nickname:"
+#~ msgstr "Bijnaam:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "E-mailadres:"
+#~ msgid "Email address:"
+#~ msgstr "E-mailadres:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary upgrade in progress."
-msgstr "Geary wordt opgewaardeerd."
+#~ msgid "Geary upgrade in progress."
+#~ msgstr "Geary wordt opgewaardeerd."
 
 #~ msgid "Archive conversation (Delete, Backspace, A)"
 #~ msgstr "Conversatie archiveren (Delete, Backspace, A)"
diff --git a/po/pl.po b/po/pl.po
index 55b92f0..52fdf88 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -18,458 +18,433 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-02 19:19+0200\n"
-"PO-Revision-Date: 2015-09-02 19:20+0200\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:09+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag gmail com>\n"
 "Language-Team: Polish <gnomepl aviary pl>\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-Language: Polish\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:55+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
 "X-Poedit-Country: Poland\n"
+"Language: pl\n"
+"X-Poedit-Language: Polish\n"
 
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Klient poczty"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Klient poczty Geary"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Wysyłanie i odbieranie wiadomości e-mail"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Mail;Poczta;Skrzynka;Wiadomość;Wiadomości;mejl;majl;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Utwórz wiadomość"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Wyślij jako e-mail"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Wysyłanie plików używając programu Geary"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Zapisz"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Dodaj"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Szkice | Szkic | Drafts | Draft"
 
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "Dodatkowe adresy dla %s"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
+"Wysłane | Wysłana poczta | Wysłane wiadomości | Skrzynka nadawcza | Sent "
+"Mail | Sent Email | Sent E-Mail"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Konta"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
+"Niechciane | Niechciana poczta | Niechciane wiadomości | Junk | Spam | Junk "
+"Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email | Bulk E-Mail"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Imię Nazwisko"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr ""
+"Kosz | Śmietnik | Usunięta poczta | Usunięte wiadomości | Trash | Rubbish | "
+"Rubbish Bin"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Welcome to Geary."
-msgstr "Witamy w programie Geary."
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr "Archiwum | Archiwa | Archive | Archives"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Enter your account information to get started."
-msgstr "Proszę wprowadzić informacje o koncie, aby rozpocząć."
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Odebrane"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "2 weeks back"
-msgstr "ostatnich 2 tygodni"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Szkice"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "1 month back"
-msgstr "ostatniego miesiąca"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Wysłane"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "3 months back"
-msgstr "ostatnich 3 miesięcy"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Wyróżnione"
 
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "6 months back"
-msgstr "ostatnich 6 miesięcy"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Ważne"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "1 year back"
-msgstr "ostatniego roku"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Wszystkie"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-msgid "2 years back"
-msgstr "ostatnich 2 lat"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Niechciane"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-msgid "4 years back"
-msgstr "ostatnich 4 lat"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Kosz"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "Everything"
-msgstr "Wszystko"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Nadane"
 
-#: ../src/client/accounts/add-edit-page.vala:280
-msgid "Edit"
-msgstr "Modyfikuj"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Wyszukaj"
 
-#: ../src/client/accounts/add-edit-page.vala:282
-msgid "Preview"
-msgstr "Podgląd"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Archiwum"
 
-#: ../src/client/accounts/add-edit-page.vala:723
-msgid "Remem_ber passwords"
-msgstr "_Zapamiętywanie haseł"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Brak"
 
-#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "_Zapamiętanie hasła"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:764
-msgid "Unable to validate:\n"
-msgstr "Nie można sprawdzić:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:766
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Nieprawidłowa etykieta konta.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:769
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; Już dodano podany adres e-mail.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:773
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; Błąd połączenia IMAP.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:776
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; Niepoprawna nazwa użytkownika lub hasło IMAP.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Inne"
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; Błąd połączenia SMTP.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "załącznik"
 
-#: ../src/client/accounts/add-edit-page.vala:782
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; Niepoprawna nazwa użytkownika lub hasło SMTP.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "udw"
 
-#: ../src/client/accounts/add-edit-page.vala:786
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Błąd połączenia.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "treść"
 
-#: ../src/client/accounts/add-edit-page.vala:790
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Niepoprawna nazwa użytkownika lub hasło.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "dw"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011-2015 Fundacja Yorba"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "od"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Witryna fundacji Yorba"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "temat"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Uruchamia program Geary z ukrytym głównym oknem"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "do"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Wyświetla informacje debugowania"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "ja"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Zapisuje w dzienniku monitoring wątków"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(brak tematu)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Zapisuje w dzienniku deserializację sieciową"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a %-e %b, %Y o %H∶%M %p"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Zapisuje w dzienniku aktywność sieciową"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "W dni %1$s użytkownik %2$s napisał:"
 
-#. / 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 "Zapisuje w dzienniku kolejkę odpowiedzi IMAP"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "Użytkownik %s napisał:"
 
-#. / 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 "Zapisuje w dzienniku serializację sieciową"
+#. / 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:234
+msgid "On %s:"
+msgstr "W dniu %s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Zapisuje w dzienniku okresową aktywność"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Przekazywana wiadomość ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr ""
-"Zapisuje w dzienniku zapytania do bazy danych (generuje dużo komunikatów)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Od: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Zapisuje w dzienniku normalizacje katalogów"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Temat: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Zezwala na badanie WebView"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Data: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Unieważnia wszystkie certyfikaty serwerów zawierające ostrzeżenia TLS"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Do: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Wyświetla wersję programu"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Dw: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Należy użyć %s, aby otworzyć nowe okno tworzenia wiadomości"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "brak"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr ""
-"Komentarze, sugestie i błędy prosimy zgłaszać do (w języku angielskim):"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Klient poczty"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Przetworzenie opcji wiersza poleceń się nie powiodło: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "Copyright 2011-2015 Fundacja Yorba"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Nieznana opcja wiersza poleceń „%s”\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Witryna fundacji Yorba"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:61
 msgid "Delete conversation"
 msgstr "Usuń wątek"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Usuń wątek (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Usuń wątki (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:67
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Przenieś wątek do kosza (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:68
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "Przenieś wątki do kosza (Delete, Backspace)"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Archiwizuj"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Archiwizuj wątek (A)"
 
-#: ../src/client/application/geary-controller.vala:75
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Archiwizuj wątki (A)"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Oznacz jako _niechciana"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Odznacz jako _niechciana"
 
-#: ../src/client/application/geary-controller.vala:81
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Oznacz wątek"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Oznacz wątek"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Nadaj etykietę wątkowi"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Nadaj etykietę wątkom"
 
-#: ../src/client/application/geary-controller.vala:85
-#: ../src/client/application/geary-controller.vala:436
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Przenieś wątek"
 
-#: ../src/client/application/geary-controller.vala:86
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Przenieś wątki"
 
-#: ../src/client/application/geary-controller.vala:373
-#: ../ui/app_menu.interface.h:1
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "_Konta"
 
-#: ../src/client/application/geary-controller.vala:378
-#: ../src/client/components/stock.vala:27 ../ui/app_menu.interface.h:2
+#: ../src/client/application/geary-controller.vala:377
+#: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "P_referencje"
 
-#: ../src/client/application/geary-controller.vala:382
-#: ../src/client/components/stock.vala:25 ../ui/app_menu.interface.h:4
+#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ../src/client/application/geary-controller.vala:386
-#: ../src/client/components/stock.vala:21 ../ui/app_menu.interface.h:5
+#: ../src/client/application/geary-controller.vala:385
+#: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_O programie"
 
-#: ../src/client/application/geary-controller.vala:390
-#: ../ui/app_menu.interface.h:3
-msgid "_Donate"
-msgstr "_Wspomóż"
-
-#: ../src/client/application/geary-controller.vala:394
-#: ../src/client/components/stock.vala:29 ../ui/app_menu.interface.h:6
+#: ../src/client/application/geary-controller.vala:389
+#: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "Za_kończ"
 
-#: ../src/client/application/geary-controller.vala:399
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Oznacz jako…"
 
-#: ../src/client/application/geary-controller.vala:405
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Oznacz jako p_rzeczytane"
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Oznacz jako _nieprzeczytane"
 
-#: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Wyróżnij"
 
-#: ../src/client/application/geary-controller.vala:422
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "Usuń wy_różnienie"
 
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Dodaj etykietę"
 
-#: ../src/client/application/geary-controller.vala:433
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Etykieta"
 
-#: ../src/client/application/geary-controller.vala:437
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Przenieś"
 
-#: ../src/client/application/geary-controller.vala:441
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Utwórz nową wiadomość (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:445
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Odpowiedz"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Odpowiedz (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:450
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "O_dpowiedz wszystkim"
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Odpowiedz wszystkim (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Przekaż"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Naprzód (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:496
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr "Opróżnij"
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr "Opróżnij katalog niechcianych wiadomości lub kosz"
 
-#: ../src/client/application/geary-controller.vala:501
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr "Opróżnij katalog _niechcianych wiadomości…"
 
-#: ../src/client/application/geary-controller.vala:505
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr "Opróżnij _kosz…"
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:538
+#: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
 msgstr "Przełącz pasek wyszukiwania"
 
-#: ../src/client/application/geary-controller.vala:752
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Nie można przechować wyjątku zaufania serwera"
 
-#: ../src/client/application/geary-controller.vala:989
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Ustawienia konta nie są bezpieczne"
 
-#: ../src/client/application/geary-controller.vala:990
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -479,17 +454,17 @@ msgstr ""
 "to, że nazwa użytkownika i hasło mogą być widoczne dla innych użytkowników "
 "sieci. Wprowadzić ustawienia?"
 
-#: ../src/client/application/geary-controller.vala:991
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "_Kontynuuj"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Błąd podczas wysyłania wiadomości"
 
-#: ../src/client/application/geary-controller.vala:1070
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -497,14 +472,12 @@ msgstr ""
 "Program Geary napotkał błąd wysyłając wiadomość. Jeśli problem będzie się "
 "powtarzał, proszę ręcznie usunąć wiadomość ze skrzynki nadawczej."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Błąd podczas zapisywania wysłanej wiadomości"
 
-#: ../src/client/application/geary-controller.vala:1075
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -512,20 +485,15 @@ msgstr ""
 "Program Geary napotkał błąd zapisując wysłaną wiadomość e-mail. Wiadomość "
 "pozostanie w skrzynce nadawczej do jej usunięcia."
 
-#: ../src/client/application/geary-controller.vala:1144
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Etykiety"
 
-#. 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:1156
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Nie można otworzyć bazy danych dla %s"
 
-#: ../src/client/application/geary-controller.vala:1157
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -549,21 +517,19 @@ msgstr ""
 "Przebudowanie bazy danych usunie wszystkie lokalne wiadomości e-mail i ich "
 "załączniki. <b>Poczta na serwerze nie zostanie usunięta.</b>"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "P_rzebuduj"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "Za_kończ"
 
-#: ../src/client/application/geary-controller.vala:1168
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Nie można przebudować bazy danych dla „%s”"
 
-#: ../src/client/application/geary-controller.vala:1169
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -573,17 +539,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1191
-#: ../src/client/application/geary-controller.vala:1201
-#: ../src/client/application/geary-controller.vala:1212
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Nie można otworzyć lokalnej skrzynki pocztowej dla %s"
 
-#: ../src/client/application/geary-controller.vala:1192
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -601,7 +563,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1202
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -613,7 +575,7 @@ msgstr ""
 "programu Geary. Baza danych nie może zostać przywrócona do działania z tą "
 "wersją programu Geary."
 
-#: ../src/client/application/geary-controller.vala:1213
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -625,14 +587,13 @@ msgstr ""
 "\n"
 "Proszę sprawdzić połączenie internetowe i uruchomić ponownie program Geary."
 
-#: ../src/client/application/geary-controller.vala:1721
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "O programie %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1724
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
 msgstr ""
 "scrx <mattpiskorz gmail com>, 2012\n"
@@ -644,18 +605,20 @@ msgstr ""
 "yorbajim <jim yorba org>, 2013\n"
 "zacol <zacol1 gmail com>, 2012\n"
 "Piotr Drąg <piotrdrag gmail com>, 2014-2015\n"
-"Aviary.pl <gnomepl aviary pl>, 2014-2015"
+"Aviary.pl <gnomepl aviary pl>, 2014-2015\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Piotr Drąg https://launchpad.net/~raven46";
 
-#: ../src/client/application/geary-controller.vala:1990
+#: ../src/client/application/geary-controller.vala:1976
 msgid "Undo move (Ctrl+Z)"
 msgstr "Cofnij przeniesienie (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2000
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Na pewno otworzyć „%s”?"
 
-#: ../src/client/application/geary-controller.vala:2001
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -663,302 +626,539 @@ msgstr ""
 "Załączniki po otwarciu mogą uszkodzić system. Należy otwierać załączniki "
 "pochodzące tylko z zaufanych źródeł."
 
-#: ../src/client/application/geary-controller.vala:2002
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "_Bez pytania ponownie"
 
-#: ../src/client/application/geary-controller.vala:2020
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Plik o nazwie „%s” już istnieje. Zastąpić go?"
 
-#: ../src/client/application/geary-controller.vala:2022
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "Plik w „%s” już istnieje. Zastąpienie go nadpisze jego zawartość."
 
-#: ../src/client/application/geary-controller.vala:2025
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Zastąp"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2323
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Zamknąć otwarte szkice?"
 
-#: ../src/client/application/geary-controller.vala:2453
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr "Usunąć wszystkie wiadomości z katalogu %s?"
 
-#: ../src/client/application/geary-controller.vala:2454
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr "Spowoduje to usunięcie wiadomości z programu Geary i serwera poczty."
 
-#: ../src/client/application/geary-controller.vala:2455
+#: ../src/client/application/geary-controller.vala:2441
 msgid "This cannot be undone."
 msgstr "Tego nie można cofnąć."
 
-#: ../src/client/application/geary-controller.vala:2456
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr "Opróżnij %s"
 
-#: ../src/client/application/geary-controller.vala:2473
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 msgid "Error emptying %s"
 msgstr "Błąd podczas opróżniania %s"
 
-#: ../src/client/application/geary-controller.vala:2503
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Trwale usunąć tą wiadomość?"
 msgstr[1] "Trwale usunąć te wiadomości?"
 msgstr[2] "Trwale usunąć te wiadomości?"
 
-#: ../src/client/application/geary-controller.vala:2505
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Usuń"
 
-#: ../src/client/application/geary-controller.vala:2536
+#: ../src/client/application/geary-controller.vala:2522
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Cofnij archiwizację (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2551
+#: ../src/client/application/geary-controller.vala:2537
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Cofnij przeniesienie do kosza (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2604
+#: ../src/client/application/geary-controller.vala:2590
 msgid "Undo (Ctrl+Z)"
 msgstr "Cofnij (Ctrl+Z)"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i dopasowanie"
-msgstr[1] "%i dopasowania"
-msgstr[2] "%i dopasowań"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Uruchamia program Geary z ukrytym głównym oknem"
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i dopasowanie (od początku)"
-msgstr[1] "%i dopasowania (od początku)"
-msgstr[2] "%i dopasowań (od początku)"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Wyświetla informacje debugowania"
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "nie odnaleziono"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Zapisuje w dzienniku monitoring wątków"
 
-#: ../src/client/components/main-window.vala:430
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Zapisuje w dzienniku deserializację sieciową"
 
-#: ../src/client/components/search-bar.vala:10
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Wyszukaj"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Zapisuje w dzienniku aktywność sieciową"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:25
-msgid "Search all mail in account for keywords (Ctrl+S)"
+#. / 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 "Zapisuje w dzienniku kolejkę odpowiedzi IMAP"
+
+#. / 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 "Zapisuje w dzienniku serializację sieciową"
+
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Zapisuje w dzienniku okresową aktywność"
+
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
 msgstr ""
-"Przeszukaj wszystkie wiadomości z konta pod kątem słów kluczowych (Ctrl+S)"
+"Zapisuje w dzienniku zapytania do bazy danych (generuje dużo komunikatów)"
 
-#: ../src/client/components/search-bar.vala:118
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indeksowanie konta %s"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Zapisuje w dzienniku normalizacje katalogów"
 
-#: ../src/client/components/search-bar.vala:129
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Przeszukiwanie konta %s"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Zezwala na badanie WebView"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Wysyłanie…"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr ""
+"Unieważnia wszystkie certyfikaty serwerów zawierające ostrzeżenia TLS"
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_OK"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Wyświetla wersję programu"
 
-#: ../src/client/components/stock.vala:19
-#: ../ui/edit_alternate_emails.glade.h:3 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Anuluj"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Należy użyć %s, aby otworzyć nowe okno tworzenia wiadomości"
 
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "Za_mknij"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+"Komentarze, sugestie i błędy prosimy zgłaszać do (w języku angielskim):"
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "Od_rzuć"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Przetworzenie opcji wiersza poleceń się nie powiodło: %s\n"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Otwórz"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Nieznana opcja wiersza poleceń „%s”\n"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "Wy_drukuj…"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s — nowe wiadomości"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Usuń"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d nowa wiadomość"
+msgstr[1] "%d nowe wiadomości"
+msgstr[2] "%d nowych wiadomości"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "Zaznacz _wszystko"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, łącznie %d nowa wiadomość"
+msgstr[1] "%s, łącznie %d nowe wiadomości"
+msgstr[2] "%s, łącznie %d nowych wiadomości"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Zachowaj"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d inna nowa wiadomość dla %s)"
+msgstr[1] ""
+"%s\n"
+"(%d inne nowe wiadomości dla %s)"
+msgstr[2] ""
+"%s\n"
+"(%d innych nowych wiadomości dla %s)"
 
-#: ../src/client/composer/composer-widget.vala:73
-msgid "Saved"
-msgstr "Zapisano"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Otwórz"
 
-#: ../src/client/composer/composer-widget.vala:74
-msgid "Saving"
-msgstr "Zapisywanie"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Ja"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "Error saving"
-msgstr "Błąd podczas zapisywania"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr "Niezaufane połączenie: %s"
 
-#: ../src/client/composer/composer-widget.vala:76
-msgid "Press Backspace to delete quote"
-msgstr "Naciśnięcie klawisza Backspace usunie cytat"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr "Nie można sprawdzić tożsamości serwera poczty %s pod adresem %s:%u."
 
-#: ../src/client/composer/composer-widget.vala:77
-msgid "New Message"
-msgstr "Nowa wiadomość"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr ""
+"Wybranie „Zaufaj temu serwerowi” lub „Zawsze ufaj temu serwerowi” może "
+"spowodować niezabezpieczone przesyłanie nazwy użytkownika i hasła."
 
-#. A 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:138
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
 msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
 msgstr ""
-"attachment|attaching|attached|enclosed|załącznik|załączam|załączyłem|"
-"załączyłam|załączono|dołączyłem|dołączyłam|dołączono|zalacznik|zalaczam|"
-"zalaczylem|zalaczylam|zalaczono|dolaczylem|dolaczylam|dolaczono"
+"Wybranie „Nie ufaj temu serwerowi” spowoduje, że program Geary nie będzie "
+"miał dostępu do tego serwera."
 
-#: ../src/client/composer/composer-widget.vala:1102
-#: ../src/client/composer/composer-widget.vala:1106
-msgid "Do you want to discard this message?"
-msgstr "Odrzucić tę wiadomość?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Program Geary nie doda ani nie zaktualizuje tego konta e-mail."
 
-#: ../src/client/composer/composer-widget.vala:1262
-msgid "Send message with an empty subject and body?"
-msgstr "Wysłać wiadomość niezawierającą tematu i treści?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"Wybranie „Nie ufaj temu serwerowi” spowoduje, że program Geary nie będzie "
+"miał dostępu do tego konta."
 
-#: ../src/client/composer/composer-widget.vala:1264
-msgid "Send message with an empty subject?"
-msgstr "Wysłać wiadomość niezawierającą tematu?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
+"Program Geary zostanie zakończony, jeśli nie ma innych otwartych kont e-mail."
 
-#: ../src/client/composer/composer-widget.vala:1266
-msgid "Send message with an empty body?"
-msgstr "Wysłać wiadomość niezawierającą treści?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"W razie pytań proszę skontaktować się z administratorem komputera lub "
+"dostawcą usług e-mail."
 
-#: ../src/client/composer/composer-widget.vala:1268
-msgid "Send message without an attachment?"
-msgstr "Wysłać wiadomość niezawierającą załączników?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr "Certyfikat serwera nie jest podpisany przez znaną instytucję"
 
-#: ../src/client/composer/composer-widget.vala:1530
-msgid "Cannot add attachment"
-msgstr "Nie można dodać załącznika"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr "Tożsamość serwera nie pasuje do tożsamości w certyfikacie"
 
-#: ../src/client/composer/composer-widget.vala:1541
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "Nie można odnaleźć „%s”."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Certyfikat serwera wygasł"
 
-#: ../src/client/composer/composer-widget.vala:1548
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "„%s” jest katalogiem."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "Certyfikat serwera nie został aktywowany"
 
-#: ../src/client/composer/composer-widget.vala:1555
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "„%s” jest pustym plikiem."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "Certyfikat serwera został unieważniony i jest teraz nieprawidłowy"
 
-#: ../src/client/composer/composer-widget.vala:1569
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "Nie można otworzyć „%s” do odczytania."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "Certyfikat serwera jest uważany za niebezpieczny"
 
-#: ../src/client/composer/composer-widget.vala:1576
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "Do wiadomości już załączono „%s”."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr "Wystąpił błąd podczas przetwarzania certyfikatu serwera"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1585
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr "Program Geary wymaga hasła do poczty, aby kontynuować"
 
-#: ../src/client/composer/composer-widget.vala:1645
-msgid "To: "
-msgstr "Do: "
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Wybór pliku"
 
-#: ../src/client/composer/composer-widget.vala:1648
-msgid "Cc: "
-msgstr "Dw: "
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Załącz"
 
-#: ../src/client/composer/composer-widget.vala:1651
-msgid "Bcc: "
-msgstr "Udw: "
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr "Dodatkowe adresy dla %s"
 
-#: ../src/client/composer/composer-widget.vala:1654
-msgid "Reply-To: "
-msgstr "Odpowiedź do: "
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Konta"
 
-#: ../src/client/composer/composer-widget.vala:1887
-msgid "Select Color"
-msgstr "Wybór koloru"
+#. / 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 "Imię Nazwisko"
 
-#. 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:2322
-#, c-format
-msgid "%1$s via %2$s"
-msgstr "%1$s przez %2$s"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Witamy w programie Geary."
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2364
-msgid "_From:"
-msgstr "_Od:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Proszę wprowadzić informacje o koncie, aby rozpocząć."
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Ja"
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "ostatnich 2 tygodni"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "ostatniego miesiąca"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "ostatnich 3 miesięcy"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "ostatnich 6 miesięcy"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "ostatniego roku"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "ostatnich 2 lat"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "ostatnich 4 lat"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Wszystko"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "Modyfikuj"
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr "Podgląd"
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "_Zapamiętywanie haseł"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "_Zapamiętanie hasła"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Nie można sprawdzić:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Nieprawidłowa etykieta konta.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Już dodano podany adres e-mail.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Błąd połączenia IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Niepoprawna nazwa użytkownika lub hasło IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Błąd połączenia SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; Niepoprawna nazwa użytkownika lub hasło SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Błąd połączenia.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Niepoprawna nazwa użytkownika lub hasło.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Zapisz"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Dodaj"
+
+#. / 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 "%l∶%M %P"
+
+#. / 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, %-l∶%M %P"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Teraz"
+
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "%d minuta temu"
+msgstr[1] "%d minuty temu"
+msgstr[2] "%d minut temu"
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "%d godzina temu"
+msgstr[1] "%d godziny temu"
+msgstr[2] "%d godzin temu"
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Wczoraj"
+
+#. / 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
+msgid "%A"
+msgstr "%A"
+
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "bajtów"
+
+#: ../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/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d wiadomość"
+msgstr[1] "%d wiadomości"
+msgstr[2] "%d wiadomości"
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d nieprzeczytana"
+msgstr[1] "%d nieprzeczytane"
+msgstr[2] "%d nieprzeczytanych"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Odebrane"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Przeszukiwanie konta %s"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d wynik"
+msgstr[1] "%d wyniki"
+msgstr[2] "%d wyników"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "Brak zaznaczonych wątków."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "%u zaznaczony wątek."
@@ -1014,7 +1214,6 @@ msgid "Date:"
 msgstr "Data:"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "%u przeczytana wiadomość"
@@ -1022,33 +1221,30 @@ msgstr[1] "%u przeczytane wiadomości"
 msgstr[2] "%u przeczytanych wiadomości"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr "Pomyślnie wysłano tę wiadomość, ale nie można jej zapisać w %s."
 
-#. Add a menu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "S_kopiuj"
 
-#. Add a menu item for copying the address.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "Skopiuj adres _e-mail"
 
-#. Add a menu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Skopiuj _odnośnik"
 
-#. Select message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "Zaznacz _wiadomość"
 
-#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Zaznacz _wszystko"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "Z_badaj"
@@ -1061,7 +1257,6 @@ msgstr "Ten odnośnik wydaje się prowadzić do"
 msgid "but actually goes to"
 msgstr ", ale tak naprawdę prowadzi do"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
 msgstr " (Nieprawidłowy?)"
@@ -1085,12 +1280,10 @@ msgstr[0] "Zapisz _załącznik…"
 msgstr[1] "Zapisz wszystkie _załączniki…"
 msgstr[2] "Zapisz wszystkie _załączniki…"
 
-#. Reply to all on a message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "Odpowiedz _wszystkim"
 
-#. Mark as read/unread.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "Oznacz jako p_rzeczytane"
@@ -1103,1078 +1296,621 @@ msgstr "Oznacz jako _nieprzeczytane"
 msgid "Mark Unread From _Here"
 msgstr "Oznacz jako nieprzeczytane od tego _miejsca"
 
-#. Separator.
-#. View original message source.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "_Wyświetl źródło"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:378
-msgid "none"
-msgstr "brak"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "Otwarcie domyślnego edytora tekstu się nie powiodło."
 
 #: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s — inspektor wątków"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Wybór pliku"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Zapisano"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Załącz"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Zapisywanie"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
-msgid "Untrusted Connection: %s"
-msgstr "Niezaufane połączenie: %s"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Błąd podczas zapisywania"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
-msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr "Nie można sprawdzić tożsamości serwera poczty %s pod adresem %s:%u."
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "Naciśnięcie klawisza Backspace usunie cytat"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
-msgid ""
-"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-"your username and password to be transmitted insecurely."
-msgstr ""
-"Wybranie „Zaufaj temu serwerowi” lub „Zawsze ufaj temu serwerowi” może "
-"spowodować niezabezpieczone przesyłanie nazwy użytkownika i hasła."
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Nowa wiadomość"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-"server."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Wybranie „Nie ufaj temu serwerowi” spowoduje, że program Geary nie będzie "
-"miał dostępu do tego serwera."
+"attachment|attaching|attached|enclosed|załącznik|załączam|załączyłem|załączył"
+"am|załączono|dołączyłem|dołączyłam|dołączono|zalacznik|zalaczam|zalaczylem|za"
+"laczylam|zalaczono|dolaczylem|dolaczylam|dolaczono"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
-msgid "Geary will not add or update this email account."
-msgstr "Program Geary nie doda ani nie zaktualizuje tego konta e-mail."
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Odrzucić tę wiadomość?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-"this account."
-msgstr ""
-"Wybranie „Nie ufaj temu serwerowi” spowoduje, że program Geary nie będzie "
-"miał dostępu do tego konta."
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Wysłać wiadomość niezawierającą tematu i treści?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr ""
-"Program Geary zostanie zakończony, jeśli nie ma innych otwartych kont e-mail."
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Wysłać wiadomość niezawierającą tematu?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
-msgid ""
-"Contact your system administrator or email service provider if you have any "
-"question about these issues."
-msgstr ""
-"W razie pytań proszę skontaktować się z administratorem komputera lub "
-"dostawcą usług e-mail."
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Wysłać wiadomość niezawierającą treści?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
-msgstr "Certyfikat serwera nie jest podpisany przez znaną instytucję"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Wysłać wiadomość niezawierającą załączników?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
-msgid "The server's identity does not match the identity in the certificate"
-msgstr "Tożsamość serwera nie pasuje do tożsamości w certyfikacie"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Nie można dodać załącznika"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
-msgid "The server's certificate has expired"
-msgstr "Certyfikat serwera wygasł"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "Nie można odnaleźć „%s”."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
-msgid "The server's certificate has not been activated"
-msgstr "Certyfikat serwera nie został aktywowany"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "„%s” jest katalogiem."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
-msgid "The server's certificate has been revoked and is now invalid"
-msgstr "Certyfikat serwera został unieważniony i jest teraz nieprawidłowy"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "„%s” jest pustym plikiem."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
-msgid "The server's certificate is considered insecure"
-msgstr "Certyfikat serwera jest uważany za niebezpieczny"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "Nie można otworzyć „%s” do odczytania."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
-msgid "An error has occurred processing the server's certificate"
-msgstr "Wystąpił błąd podczas przetwarzania certyfikatu serwera"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "Do wiadomości już załączono „%s”."
 
-#. 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 "Geary requires your email password to continue"
-msgstr "Program Geary wymaga hasła do poczty, aby kontynuować"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. 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 wiadomość"
-msgstr[1] "%d wiadomości"
-msgstr[2] "%d wiadomości"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Do: "
 
-#. / 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 nieprzeczytana"
-msgstr[1] "%d nieprzeczytane"
-msgstr[2] "%d nieprzeczytanych"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Dw: "
 
-#. / 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/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Udw: "
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Odebrane"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "Odpowiedź do: "
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d wynik"
-msgstr[1] "%d wyniki"
-msgstr[2] "%d wyników"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Wybór koloru"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s — nowe wiadomości"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr "%1$s przez %2$s"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d nowa wiadomość"
-msgstr[1] "%d nowe wiadomości"
-msgstr[2] "%d nowych wiadomości"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_Od:"
 
-#: ../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] "%s, łącznie %d nowa wiadomość"
-msgstr[1] "%s, łącznie %d nowe wiadomości"
-msgstr[2] "%s, łącznie %d nowych wiadomości"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 inna nowa wiadomość dla %s)"
-msgstr[1] ""
-"%s\n"
-"(%d inne nowe wiadomości dla %s)"
-msgstr[2] ""
-"%s\n"
-"(%d innych nowych wiadomości dla %s)"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Wysyłanie…"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Otwórz"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i dopasowanie"
+msgstr[1] "%i dopasowania"
+msgstr[2] "%i dopasowań"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i dopasowanie (od początku)"
+msgstr[1] "%i dopasowania (od początku)"
+msgstr[2] "%i dopasowań (od początku)"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "nie odnaleziono"
 
-#. / 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"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_OK"
 
-#. / 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"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Anuluj"
 
-#. / 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"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "Za_mknij"
 
-#. / 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"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "Od_rzuć"
 
-#. / 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"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Otwórz"
 
-#. / 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"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "Wy_drukuj…"
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Teraz"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Usuń"
 
-#: ../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "%d minuta temu"
-msgstr[1] "%d minuty temu"
-msgstr[2] "%d minut temu"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Zachowaj"
 
-#: ../src/client/util/util-date.vala:171
-#, c-format
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "%d godzina temu"
-msgstr[1] "%d godziny temu"
-msgstr[2] "%d godzin temu"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr ""
+"Przeszukaj wszystkie wiadomości z konta pod kątem słów kluczowych (Ctrl+S)"
 
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "Wczoraj"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Indeksowanie konta %s"
 
-#. / 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"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(brak tematu)"
+#~ msgid "Geary Mail"
+#~ msgstr "Klient poczty Geary"
 
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "bajtów"
+#~ msgid "Send and receive email"
+#~ msgstr "Wysyłanie i odbieranie wiadomości e-mail"
 
-#: ../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Email;E-mail;Mail;Poczta;Skrzynka;Wiadomość;Wiadomości;mejl;majl;"
 
-#: ../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#~ msgid "Compose Message"
+#~ msgstr "Utwórz wiadomość"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#~ msgid "Send by email"
+#~ msgstr "Wyślij jako e-mail"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#~ msgid "Send files using Geary"
+#~ msgstr "Wysyłanie plików używając programu Geary"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#~ msgid "_Donate"
+#~ msgstr "_Wspomóż"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Nie można usunąć konta</span> "
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Otwarto okno modyfikacji wiadomości powiązane z tym kontem. Proszę wysłać "
+#~ "wiadomość lub przerwać jej tworzenie i spróbować ponownie."
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Inne"
+#~ msgid "Add account"
+#~ msgstr "Dodaj konto"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#~ msgid "Edit account"
+#~ msgstr "Modyfikuj konto"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#~ msgid "Remove account"
+#~ msgstr "Usuń konto"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Odebrane"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Proszę czekać, program Geary sprawdza poprawność konta."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Szkice"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Niezaufane połączenie"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Wysłane"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "_Zawsze ufaj temu serwerowi"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Wyróżnione"
+#~ msgid "_Trust This Server"
+#~ msgstr "Z_aufaj temu serwerowi"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Ważne"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "_Nie ufaj temu serwerowi"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Wszystkie"
+#~ msgid "_Undo"
+#~ msgstr "Cof_nij"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Niechciane"
+#~ msgid "_Redo"
+#~ msgstr "P_onów"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Kosz"
+#~ msgid "Cu_t"
+#~ msgstr "_Wytnij"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Nadane"
+#~ msgid "_Paste"
+#~ msgstr "Wk_lej"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Archiwum"
+#~ msgid "_Left"
+#~ msgstr "Wyrównanie w _lewo"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-msgstr "Brak"
+#~ msgid "_Right"
+#~ msgstr "Wy_równanie w prawo"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-msgid "attachment"
-msgstr "załącznik"
+#~ msgid "_Center"
+#~ msgstr "Wyśro_dkowanie"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
-msgstr "udw"
+#~ msgid "_Justify"
+#~ msgstr "Wyrów_nanie w prawo i lewo"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
-msgstr "treść"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Odnośnik (Ctrl+L)"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "cc"
-msgstr "dw"
+#~ msgid "C_olor"
+#~ msgstr "K_olor"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
-msgstr "od"
+#~ msgid "More options"
+#~ msgstr "Więcej opcji"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-msgid "subject"
-msgstr "temat"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Cytuj tekst (Ctrl+])"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
-msgstr "do"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Usuń cytat (Ctrl+[)"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
-msgstr "ja"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Usuń formatowanie (Ctrl+Space)"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-msgid "Drafts | Draft"
-msgstr "Szkice | Szkic | Drafts | Draft"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Wstaw _z formatowaniem"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr ""
-"Wysłane | Wysłana poczta | Wysłane wiadomości | Skrzynka nadawcza | Sent "
-"Mail | Sent Email | Sent E-Mail"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Pogrub tekst (Ctrl+B)"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
-msgstr ""
-"Niechciane | Niechciana poczta | Niechciane wiadomości | Junk | Spam | Junk "
-"Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email | Bulk E-Mail"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Pochyl tekst (Ctrl+I)"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr ""
-"Kosz | Śmietnik | Usunięta poczta | Usunięte wiadomości | Trash | Rubbish | "
-"Rubbish Bin"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Podkreśl tekst (Ctrl+U)"
 
-#. List of folder names to match for Archive, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
-msgid "Archive | Archives"
-msgstr "Archiwum | Archiwa | Archive | Archives"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Przekreśl tekst (Ctrl+K)"
 
-#. / 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:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a %-e %b, %Y o %H∶%M %p"
+#~ msgid "_Rich Text"
+#~ msgstr "Tekst _sformatowany"
 
-#. / 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:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "W dni %1$s użytkownik %2$s napisał:"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Rozszerzone pola"
 
-#. / 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:228
-#, c-format
-msgid "%s wrote:"
-msgstr "Użytkownik %s napisał:"
+#~ msgctxt "Label"
+#~ msgid "Close and Save"
+#~ msgstr "Zamknij i zapisz"
 
-#. / 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:234
-#, c-format
-msgid "On %s:"
-msgstr "W dniu %s:"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "Zamknij i zapisz"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Przekazywana wiadomość ----------"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "Zamyka i zapisuje"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "Od: %s\n"
+#~ msgctxt "Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Zamknij i odrzuć"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Temat: %s\n"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Zamknij i odrzuć"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "Data: %s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "Zamyka i odrzuca"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "Do: %s\n"
+#~ msgid "Lar_ge"
+#~ msgstr "_Duży"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Dw: %s\n"
+#~ msgid "Large"
+#~ msgstr "Duży"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">Nie można usunąć konta</span> "
+#~ msgid "_Medium"
+#~ msgstr "Ś_redni"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Otwarto okno modyfikacji wiadomości powiązane z tym kontem. Proszę wysłać "
-"wiadomość lub przerwać jej tworzenie i spróbować ponownie."
+#~ msgid "Medium"
+#~ msgstr "Średni"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Dodaj konto"
+#~ msgid "_Small"
+#~ msgstr "_Mały"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Modyfikuj konto"
+#~ msgid "Small"
+#~ msgstr "Mały"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Usuń konto"
+#~ msgid "S_ans Serif"
+#~ msgstr "_Bezszeryfowa"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Proszę czekać, program Geary sprawdza poprawność konta."
+#~ msgid "Sans Serif"
+#~ msgstr "Bezszeryfowa"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Niezaufane połączenie"
+#~ msgid "S_erif"
+#~ msgstr "Sz_eryfowa"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "_Zawsze ufaj temu serwerowi"
+#~ msgid "Serif"
+#~ msgstr "Szeryfowa"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "Z_aufaj temu serwerowi"
+#~ msgid "_Fixed Width"
+#~ msgstr "S_tała szerokość"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "_Nie ufaj temu serwerowi"
+#~ msgid "Fixed Width"
+#~ msgstr "Stała szerokość"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "Cof_nij"
-
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "P_onów"
-
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "_Wytnij"
-
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "Wk_lej"
-
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "Wyrównanie w _lewo"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "Wy_równanie w prawo"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "Wyśro_dkowanie"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "Wyrów_nanie w prawo i lewo"
-
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Odnośnik (Ctrl+L)"
-
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "K_olor"
-
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Więcej opcji"
-
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Cytuj tekst (Ctrl+])"
-
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Usuń cytat (Ctrl+[)"
-
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Usuń formatowanie (Ctrl+Space)"
-
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Wstaw _z formatowaniem"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Pogrub tekst (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Pochyl tekst (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Podkreśl tekst (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Przekreśl tekst (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "Tekst _sformatowany"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Rozszerzone pola"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "Zamknij i zapisz"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "Zamknij i zapisz"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "Zamyka i zapisuje"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "Zamknij i odrzuć"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "Zamknij i odrzuć"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "Zamyka i odrzuca"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "_Duży"
-
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "Duży"
-
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "Ś_redni"
-
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "Średni"
-
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "_Mały"
-
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "Mały"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "_Bezszeryfowa"
-
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "Bezszeryfowa"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "Sz_eryfowa"
-
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "Szeryfowa"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "S_tała szerokość"
-
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "Stała szerokość"
-
-#: ../ui/composer.glade.h:42
-msgid "Detach"
-msgstr "Odłącz"
-
-#: ../ui/composer.glade.h:43
-msgid "Detach (Ctrl+D)"
-msgstr "Odłącz (Ctrl+D)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_Wyślij"
-
-#: ../ui/composer.glade.h:45
-msgid "Send"
-msgstr "Wyślij"
-
-#: ../ui/composer.glade.h:46
-msgid "Send (Ctrl+Enter)"
-msgstr "Wyślij (Ctrl+Enter)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "Z_ałącz plik"
-
-#: ../ui/composer.glade.h:48
-msgid "Attach File"
-msgstr "Załącz plik"
-
-#: ../ui/composer.glade.h:49
-msgid "_Include Original Attachments"
-msgstr "Załącz _oryginalne załączniki"
-
-#: ../ui/composer.glade.h:50
-msgid "Include Original Attachments"
-msgstr "Załącz oryginalne załączniki"
-
-#: ../ui/composer.glade.h:51
-msgid "Application Menu"
-msgstr "Menu programu"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:53
-msgid "_To"
-msgstr "_Do"
+#~ msgid "Detach"
+#~ msgstr "Odłącz"
 
-#: ../ui/composer.glade.h:54
-msgid "_Cc"
-msgstr "Do _wiadomości"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Odłącz (Ctrl+D)"
 
-#: ../ui/composer.glade.h:55
-msgid "_Subject"
-msgstr "_Temat"
+#~ msgid "_Send"
+#~ msgstr "_Wyślij"
 
-#: ../ui/composer.glade.h:56
-msgid "_Bcc"
-msgstr "_Ukryty do wiadomości"
+#~ msgid "Send"
+#~ msgstr "Wyślij"
 
-#: ../ui/composer.glade.h:57
-msgid "_Reply-To"
-msgstr "_Odpowiedź do"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Wyślij (Ctrl+Enter)"
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:59
-msgid "From"
-msgstr "Od"
+#~ msgid "_Attach File"
+#~ msgstr "Z_ałącz plik"
 
-#: ../ui/composer.glade.h:60
-msgid "Drop files here"
-msgstr "Tutaj można upuścić pliki,"
+#~ msgid "Attach File"
+#~ msgstr "Załącz plik"
 
-#: ../ui/composer.glade.h:61
-msgid "To add them as attachments"
-msgstr "aby dodać je jako załączniki."
+#~ msgid "_Include Original Attachments"
+#~ msgstr "Załącz _oryginalne załączniki"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-msgid "Remove email address"
-msgstr "Usuwa adres e-mail"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Załącz oryginalne załączniki"
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"Niektórzy dostawcy usług e-mail wymagają skonfigurowania dodatkowych adresów "
-"na serwerze. Proszę skontaktować się ze swoim dostawcą, aby dowiedzieć się "
-"więcej."
+#~ msgid "Application Menu"
+#~ msgstr "Menu programu"
 
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "Z_aktualizuj"
+#~ msgid "_To"
+#~ msgstr "_Do"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Wyszukiwanie:"
+#~ msgid "_Cc"
+#~ msgstr "Do _wiadomości"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Poprzednie"
+#~ msgid "_Subject"
+#~ msgstr "_Temat"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Następne"
+#~ msgid "_Bcc"
+#~ msgstr "_Ukryty do wiadomości"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Rozróżnianie małych i wielkich liter"
+#~ msgid "_Reply-To"
+#~ msgstr "_Odpowiedź do"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "etykieta"
+#~ msgid "From"
+#~ msgstr "Od"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Hasło"
+#~ msgid "Drop files here"
+#~ msgstr "Tutaj można upuścić pliki,"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "Adres e-_mail"
+#~ msgid "To add them as attachments"
+#~ msgstr "aby dodać je jako załączniki."
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Hasło"
+#~ msgid "Remove email address"
+#~ msgstr "Usuwa adres e-mail"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "_Usługa"
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "Niektórzy dostawcy usług e-mail wymagają skonfigurowania dodatkowych adresów "
+#~ "na serwerze. Proszę skontaktować się ze swoim dostawcą, aby dowiedzieć się "
+#~ "więcej."
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "N_azwa"
+#~ msgid "_Update"
+#~ msgstr "Z_aktualizuj"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "Pseudon_im"
+#~ msgid "Find:"
+#~ msgstr "Wyszukiwanie:"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Praca, dom itp."
+#~ msgid "_Previous"
+#~ msgstr "_Poprzednie"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_Zapisywanie wysłanych wiadomości"
+#~ msgid "_Next"
+#~ msgstr "_Następne"
 
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
-msgstr "Doda_tkowe adresy e-mail…"
+#~ msgid "_Case sensitive"
+#~ msgstr "_Rozróżnianie małych i wielkich liter"
 
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "Ustawienia IMAP"
+#~ msgid "label"
+#~ msgstr "etykieta"
 
-#: ../ui/login.glade.h:12
-msgid "Se_rver"
-msgstr "Se_rwer"
+#~ msgid "Password"
+#~ msgstr "Hasło"
 
-#: ../ui/login.glade.h:13
-msgid "P_ort"
-msgstr "P_ort"
+#~ msgid "E_mail address"
+#~ msgstr "Adres e-_mail"
 
-#: ../ui/login.glade.h:14
-msgid "Ser_ver"
-msgstr "Ser_wer"
+#~ msgid "_Password"
+#~ msgstr "_Hasło"
 
-#: ../ui/login.glade.h:15
-msgid "Por_t"
-msgstr "Por_t"
+#~ msgid "S_ervice"
+#~ msgstr "_Usługa"
 
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "Ustawienia SMTP"
+#~ msgid "N_ame"
+#~ msgstr "N_azwa"
 
-#: ../ui/login.glade.h:17
-msgid "User_name"
-msgstr "_Nazwa użytkownika"
+#~ msgid "N_ickname"
+#~ msgstr "Pseudon_im"
 
-#: ../ui/login.glade.h:18
-msgid "Pass_word"
-msgstr "Ha_sło"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Praca, dom itp."
 
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr "Nazwa użytkownika SMTP"
+#~ msgid "_Save sent mail"
+#~ msgstr "_Zapisywanie wysłanych wiadomości"
 
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr "Hasło SMTP"
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "Doda_tkowe adresy e-mail…"
 
-#: ../ui/login.glade.h:21
-msgid "_Username"
-msgstr "Nazwa _użytkownika"
+#~ msgid "IMAP settings"
+#~ msgstr "Ustawienia IMAP"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr "Nazwa użytkownika IMAP"
+#~ msgid "Se_rver"
+#~ msgstr "Se_rwer"
 
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr "Hasło IMAP"
+#~ msgid "P_ort"
+#~ msgstr "P_ort"
 
-#: ../ui/login.glade.h:24
-msgid "Encr_yption"
-msgstr "_Szyfrowanie"
+#~ msgid "Ser_ver"
+#~ msgstr "Ser_wer"
 
-#: ../ui/login.glade.h:25
-msgid "Encrypt_ion"
-msgstr "S_zyfrowanie"
+#~ msgid "Por_t"
+#~ msgstr "Por_t"
 
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "SMTP settings"
+#~ msgstr "Ustawienia SMTP"
 
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "User_name"
+#~ msgstr "_Nazwa użytkownika"
 
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "Bez _wymagania uwierzytelniania"
+#~ msgid "Pass_word"
+#~ msgstr "Ha_sło"
 
-#: ../ui/login.glade.h:30
-msgid "Use IMAP cre_dentials"
-msgstr "Używanie _danych logowania IMAP"
+#~ msgid "SMTP username"
+#~ msgstr "Nazwa użytkownika SMTP"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Tworzenie"
+#~ msgid "SMTP password"
+#~ msgstr "Hasło SMTP"
 
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr "Zapisywanie sz_kiców na serwerze"
+#~ msgid "_Username"
+#~ msgstr "Nazwa _użytkownika"
 
-#: ../ui/login.glade.h:33
-msgid "Si_gn emails (HTML allowed):"
-msgstr "_Podpisywanie wiadomości (HTML jest dozwolony):"
+#~ msgid "IMAP username"
+#~ msgstr "Nazwa użytkownika IMAP"
 
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "Przechowywanie"
+#~ msgid "IMAP password"
+#~ msgstr "Hasło IMAP"
 
-#: ../ui/login.glade.h:35
-msgid "_Download mail"
-msgstr "_Pobieranie wiadomości"
+#~ msgid "Encr_yption"
+#~ msgstr "_Szyfrowanie"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "Dane logowania SMTP"
+#~ msgid "Encrypt_ion"
+#~ msgstr "S_zyfrowanie"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "Nazwa użytkownika"
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Zapamiętanie hasła"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Uwierzytelnij"
+#~ msgid "No authentication re_quired"
+#~ msgstr "Bez _wymagania uwierzytelniania"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Czytanie"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Używanie _danych logowania IMAP"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "_Automatyczne wybieranie następnej wiadomości"
+#~ msgid "Composer"
+#~ msgstr "Tworzenie"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "P_odgląd wątku"
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Zapisywanie sz_kiców na serwerze"
 
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr "Widok _trzech paneli"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "_Podpisywanie wiadomości (HTML jest dozwolony):"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "Sprawdzanie p_isowni"
+#~ msgid "Storage"
+#~ msgstr "Przechowywanie"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "Powiadomienia"
+#~ msgid "_Download mail"
+#~ msgstr "_Pobieranie wiadomości"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "_Dźwięki powiadomień"
+#~ msgid "SMTP Credentials"
+#~ msgstr "Dane logowania SMTP"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "_Powiadomienia o nowych wiadomościach"
+#~ msgid "Username"
+#~ msgstr "Nazwa użytkownika"
 
-#: ../ui/preferences.glade.h:10
-msgid "Always _watch for new mail"
-msgstr "_Monitorowanie nowych wiadomości"
+#~ msgid "_Remember password"
+#~ msgstr "_Zapamiętanie hasła"
 
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr ""
-"Program Geary będzie działał w tle i powiadamiał o nowych wiadomościach"
+#~ msgid "_Authenticate"
+#~ msgstr "_Uwierzytelnij"
 
-#: ../ui/preferences.glade.h:12
-msgid "Preferences"
-msgstr "Preferencje"
+#~ msgid "Reading"
+#~ msgstr "Czytanie"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Na pewno usunąć to konto?</span> "
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Automatyczne wybieranie następnej wiadomości"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Cała poczta powiązana z tym kontem zostanie usunięta z komputera. Poczta na "
-"serwerze nie zostanie usunięta."
+#~ msgid "_Display conversation preview"
+#~ msgstr "P_odgląd wątku"
+
+#~ msgid "Use _three pane view"
+#~ msgstr "Widok _trzech paneli"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Sprawdzanie p_isowni"
+
+#~ msgid "Notifications"
+#~ msgstr "Powiadomienia"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Dźwięki powiadomień"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "_Powiadomienia o nowych wiadomościach"
+
+#~ msgid "Always _watch for new mail"
+#~ msgstr "_Monitorowanie nowych wiadomości"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr ""
+#~ "Program Geary będzie działał w tle i powiadamiał o nowych wiadomościach"
+
+#~ msgid "Preferences"
+#~ msgstr "Preferencje"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Na pewno usunąć to konto?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Cała poczta powiązana z tym kontem zostanie usunięta z komputera. Poczta na "
+#~ "serwerze nie zostanie usunięta."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Etykieta:"
+#~ msgid "Nickname:"
+#~ msgstr "Etykieta:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Adres e-mail:"
+#~ msgid "Email address:"
+#~ msgstr "Adres e-mail:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Trwa aktualizacja programu Geary…"
+#~ msgid "Geary update in progress…"
+#~ msgstr "Trwa aktualizacja programu Geary…"
diff --git a/po/pt.po b/po/pt.po
index 075b626..7e7d99f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -12,466 +12,442 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-03-31 18:11+0000\n"
-"PO-Revision-Date: 2015-09-10 08:24+0100\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:09+0000\n"
 "Last-Translator: Pedro Albuquerque <palbuquerque73 gmail com>\n"
 "Language-Team: Português <palbuquerque73 gmail com>\n"
-"Language: pt\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 2.91.6\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-#| msgid "Geary Mail"
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Cliente de correio eletrónico"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary Mail"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Enviar e receber mensagens"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Mail;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Escrever mensagem"
-
-#: ../desktop/geary-attach.contract.in.h:1
-#| msgid "Send and receive email"
-msgid "Send by email"
-msgstr "Enviar por email"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Enviar ficheiros com o Geary"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Gravar"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:55+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: pt\n"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Adicionar"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+#| msgid "Drafts"
+msgid "Drafts | Draft"
+msgstr "Rascunhos | Rascunho"
 
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "Endereços adicionais para %s"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr "Enviadas | Correio enviado | Emails enviados | E-mails enviados"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Contas"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
+"Não solicitado | Spam | Sucata | Lixo eletrónico | Correio em massa | Emails "
+"em massa | E-mails em massa"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Primeiro Último"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Lixo | Lixeira"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Welcome to Geary."
-msgstr "Boas vindas ao Geary."
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr "Arquivos | Arquivos"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Enter your account information to get started."
-msgstr "Insira as informações de conta."
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Entrada"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "2 weeks back"
-msgstr "2 semanas atrás"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Rascunhos"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "1 month back"
-msgstr "1 mês atrás"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Enviadas"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "3 months back"
-msgstr "3 meses atrás"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Com estrela"
 
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "6 months back"
-msgstr "6 meses atrás"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Importante"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "1 year back"
-msgstr "1 ano atrás"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Todo o correio"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-#| msgid "1 year back"
-msgid "2 years back"
-msgstr "2 anos atrás"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Não solicitado"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-#| msgid "1 year back"
-msgid "4 years back"
-msgstr "4 anos atrás"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Lixo"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "Everything"
-msgstr "Tudo"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Saída"
 
-#: ../src/client/accounts/add-edit-page.vala:280
-msgid "Edit"
-msgstr "Editar"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Procura"
 
-#: ../src/client/accounts/add-edit-page.vala:282
-msgid "Preview"
-msgstr "Antever"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Arquivo"
 
-#: ../src/client/accounts/add-edit-page.vala:723
-msgid "Remem_ber passwords"
-msgstr "_Lembrar senhas"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Nenhum"
 
-#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "_Lembrar senha"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:764
-msgid "Unable to validate:\n"
-msgstr "Impossível validar:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:766
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; nome de conta inválido.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:769
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "&#8226; endereço eletrónico já adicionado ao Geary.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:773
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; erro de ligação IMAP.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:776
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; utilizador ou senha IMAP inválidos.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Outro"
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; erro de ligação SMTP.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+#| msgid "Save A_ttachment..."
+#| msgid_plural "Save All A_ttachments..."
+msgid "attachment"
+msgstr "anexo"
 
-#: ../src/client/accounts/add-edit-page.vala:782
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; utilizador ou senha SMTP inválidos.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "bcc"
 
-#: ../src/client/accounts/add-edit-page.vala:786
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; erro de ligação.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "corpo"
 
-#: ../src/client/accounts/add-edit-page.vala:790
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; utilizador ou senha inválidos.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+#| msgid "Bcc:"
+msgid "cc"
+msgstr "cc"
 
-#: ../src/client/application/geary-application.vala:19
-#| msgid "Copyright 2011-2013 Yorba Foundation"
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Direitos de autor 2011-2015 Fundação Yorba"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "de"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Visite a página web da Yorba"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+#| msgid "Subject:"
+msgid "subject"
+msgstr "assunto"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Iniciar o Geary com a janela principal oculta"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "para"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Informações de depuração de saída"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "eu"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Registar monitorização de conversação"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(sem assunto)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Registar desserialização da rede"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %-e de %b de %Y às %-H:%M"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Registar atividade de rede"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "Em %1$s, %2$s escreveu:"
 
-#. / 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 "Registar fila de eventos IMAP"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s escreveu:"
 
-#. / 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 "Registar serialização de rede"
+#. / 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:234
+msgid "On %s:"
+msgstr "Em %s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Registar atividade periódica"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "-------- Mensagem reencaminhada --------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Registar consultas à base de dados (gera muitas mensagens)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "De: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Registar sincronização de pastas"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Assunto: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Permitir inspeção da vista web"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Data: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Revogar todos os certificados do servidor com avisos TLS"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Para: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Mostrar versão do programa"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Cc: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Usar %s para abir uma janela de nova mensagem"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "nenhum"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Por favor, reporte comentários, sugestões e erros em:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Cliente de correio eletrónico"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Erro ao processar as opções da linha de comandos: %s\n"
+#: ../src/client/application/geary-application.vala:19
+#| msgid "Copyright 2011-2013 Yorba Foundation"
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "Direitos de autor 2011-2015 Fundação Yorba"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Opção de linha de comandos não reconhecida \"%s\"\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Visite a página web da Yorba"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:61
 #| msgid "Move conversation"
 msgid "Delete conversation"
 msgstr "Eliminar conversa"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:62
 #| msgid "Delete conversation (Delete, Backspace, A)"
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Eliminar conversa (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:63
 #| msgid "Delete conversations (Delete, Backspace, A)"
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Eliminar conversas (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:67
 #| msgid "Archive conversations (Delete, Backspace, A)"
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Mover conversa para o lixo (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:68
 #| msgid "Archive conversations (Delete, Backspace, A)"
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "Mover conversas para o lixo (Delete, Backspace)"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Arquivar"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:73
 #| msgid "Move conversation"
 msgid "Archive conversation (A)"
 msgstr "Arquivar conversa (A)"
 
-#: ../src/client/application/geary-controller.vala:75
+#: ../src/client/application/geary-controller.vala:74
 #| msgid "Move conversations"
 msgid "Archive conversations (A)"
 msgstr "Arquivar conversas (A)"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Marcar como _Não solicitado"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Marcar como _Solicitado"
 
-#: ../src/client/application/geary-controller.vala:81
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Marcar conversa"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Marcar conversas"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Adicionar etiqueta à conversa"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Adicionar etiqueta às conversas"
 
-#: ../src/client/application/geary-controller.vala:85
-#: ../src/client/application/geary-controller.vala:436
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Mover conversa"
 
-#: ../src/client/application/geary-controller.vala:86
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Mover conversas"
 
-#: ../src/client/application/geary-controller.vala:373
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "_Contas"
 
-#: ../src/client/application/geary-controller.vala:378
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../src/client/application/geary-controller.vala:382
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "A_Juda"
 
-#: ../src/client/application/geary-controller.vala:386
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../src/client/application/geary-controller.vala:390
-msgid "_Donate"
-msgstr "_Doar"
-
-#: ../src/client/application/geary-controller.vala:394
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../src/client/application/geary-controller.vala:399
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Marcar como..."
 
-#: ../src/client/application/geary-controller.vala:405
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Marcar como _Lida"
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Marcar como _Não lida"
 
-#: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Estrela"
 
-#: ../src/client/application/geary-controller.vala:422
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "_Remover estrela"
 
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Adicionar etiqueta"
 
-#: ../src/client/application/geary-controller.vala:433
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Etiqueta"
 
-#: ../src/client/application/geary-controller.vala:437
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../src/client/application/geary-controller.vala:441
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Criar nova mensagem (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:445
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Responder (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:450
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "Responder a _Todos"
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Responder a todos (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Reencaminhar"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Encaminhar (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:496
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr "Esvaziar"
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr "Esvaziar pastas Não solicitado ou Lixo"
 
-#: ../src/client/application/geary-controller.vala:501
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr "Esvaziar _Não solicitado…"
 
-#: ../src/client/application/geary-controller.vala:505
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr "Esvaziar _Lixo…"
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:538
+#: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
 msgstr "Alternar barra de procura"
 
-#: ../src/client/application/geary-controller.vala:752
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Impossível armazenar exceção de confiança do servidor"
 
-#: ../src/client/application/geary-controller.vala:989
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "As suas definições são inseguras"
 
-#: ../src/client/application/geary-controller.vala:990
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -481,17 +457,17 @@ msgstr ""
 "Isto significa que seu nome de utilizador e a senha poderão ser lidos por "
 "outra pessoa na rede. Tem certeza que deseja fazer isto?"
 
-#: ../src/client/application/geary-controller.vala:991
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "Co_Ntinuar"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Erro ao enviar mensagem"
 
-#: ../src/client/application/geary-controller.vala:1070
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -499,15 +475,13 @@ msgstr ""
 "O Geary encontrou um erro ao enviar a mensagem. Se o problema persistir, "
 "elimine manualmente a mensagem da sua caixa de saída."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 #| msgid "Error sending email"
 msgid "Error saving sent mail"
 msgstr "Erro ao gravar mensagem enviada"
 
-#: ../src/client/application/geary-controller.vala:1075
+#: ../src/client/application/geary-controller.vala:1069
 #| msgid ""
 #| "Geary encountered an error sending an email.  If the problem persists, "
 #| "please manually delete the email from your Outbox folder."
@@ -518,20 +492,15 @@ msgstr ""
 "O Geary encontrou um erro ao gravar a mensagem enviada na caixa Enviadas. A "
 "mensagem ficará na sua caixa de saída até que a elimine."
 
-#: ../src/client/application/geary-controller.vala:1144
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Etiquetas"
 
-#. 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:1156
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Impossível abrir a base de dados de %s"
 
-#: ../src/client/application/geary-controller.vala:1157
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -554,21 +523,19 @@ msgstr ""
 "A reconstrução da base de dados destruirá todas as mensagens locais e os "
 "seus anexos. <b>As mensagens no servidor não serão afetadas.</b>."
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "_Reconstruir"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "_Sair"
 
-#: ../src/client/application/geary-controller.vala:1168
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Impossível reconstruir a base de dados de \"%s\""
 
-#: ../src/client/application/geary-controller.vala:1169
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -578,17 +545,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1191
-#: ../src/client/application/geary-controller.vala:1201
-#: ../src/client/application/geary-controller.vala:1212
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Impossível abrir a caixa de correio local de %s"
 
-#: ../src/client/application/geary-controller.vala:1192
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -606,7 +569,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1202
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -620,7 +583,7 @@ msgstr ""
 "\n"
 "Por favor instale a versão mais recente do Geary e tente novamente."
 
-#: ../src/client/application/geary-controller.vala:1213
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -632,30 +595,31 @@ msgstr ""
 "\n"
 "Por favor verifique a ligação à rede e reinicie o Geary."
 
-#: ../src/client/application/geary-controller.vala:1721
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "Sobre o %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1724
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
 msgstr ""
 "Sérgio Marques <smarquespt gmail com>\n"
-"Pedro Albuquerque <palbuquerque73 gmail com>, 2015"
+"Pedro Albuquerque <palbuquerque73 gmail com>, 2015\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Pedro Albuquerque https://launchpad.net/~palbuquerque73";
 
-#: ../src/client/application/geary-controller.vala:1990
+#: ../src/client/application/geary-controller.vala:1976
 #| msgid "Underline (Ctrl+U)"
 msgid "Undo move (Ctrl+Z)"
 msgstr "Desfazer mover (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2000
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Tem a certeza que quer abrir \"%s\"?"
 
-#: ../src/client/application/geary-controller.vala:2001
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -663,313 +627,541 @@ msgstr ""
 "Os anexos podem causar danos ao seu sistema se forem abertos. Só deve abrir "
 "ficheiros de fontes de confiança."
 
-#: ../src/client/application/geary-controller.vala:2002
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "_Não perguntar novamente"
 
-#: ../src/client/application/geary-controller.vala:2020
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Já existe um ficheiro com o nome \"%s\". Quer substituí-lo?"
 
-#: ../src/client/application/geary-controller.vala:2022
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "O ficheiro já existe em \"%s\". Se o substituir, o seu conteúdo será perdido."
 
-#: ../src/client/application/geary-controller.vala:2025
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Substituir"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2323
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Fechar rascunhos abertos?"
 
-#: ../src/client/application/geary-controller.vala:2453
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr "Esvaziar todas as mensagens na sua pasta %s?"
 
-#: ../src/client/application/geary-controller.vala:2454
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr "Isto remove o correio do Geary e do seu servidor de correio."
 
-#: ../src/client/application/geary-controller.vala:2455
+#: ../src/client/application/geary-controller.vala:2441
 #| msgid "\"%s\" could not be found."
 msgid "This cannot be undone."
 msgstr "Não pode ser desfeito."
 
-#: ../src/client/application/geary-controller.vala:2456
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr "Esvaziar %s"
 
-#: ../src/client/application/geary-controller.vala:2473
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 #| msgid "Error saving"
 msgid "Error emptying %s"
 msgstr "Erro ao esvaziar %s"
 
-#: ../src/client/application/geary-controller.vala:2503
+#: ../src/client/application/geary-controller.vala:2489
 #| 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] "Quer eliminar permanentemente esta mensagem?"
 msgstr[1] "Quer eliminar permanentemente estas mensagens?"
 
-#: ../src/client/application/geary-controller.vala:2505
+#: ../src/client/application/geary-controller.vala:2491
 #| msgid "_Delete"
 msgid "Delete"
 msgstr "_Eliminar"
 
-#: ../src/client/application/geary-controller.vala:2536
+#: ../src/client/application/geary-controller.vala:2522
 #| msgid "Underline (Ctrl+U)"
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Desfazer arquivar (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2551
+#: ../src/client/application/geary-controller.vala:2537
 #| msgid "Unquote text (Ctrl+[)"
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Desfazer lixo (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2604
+#: ../src/client/application/geary-controller.vala:2590
 #| msgid "Underline (Ctrl+U)"
 msgid "Undo (Ctrl+Z)"
 msgstr "Desfazer (Ctrl+Z)"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-#| msgid "%i matches"
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i ocorrência"
-msgstr[1] "%i ocorrências"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Iniciar o Geary com a janela principal oculta"
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-#| msgid "%i matches"
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i ocorrência"
-msgstr[1] "%i ocorrências"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Informações de depuração de saída"
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "não encontrado"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Registar monitorização de conversação"
 
-#: ../src/client/components/main-window.vala:430
-#, c-format
-#| msgid "%s (%s)"
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Registar desserialização da rede"
 
-#: ../src/client/components/search-bar.vala:10
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Procura"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Registar atividade de rede"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:25
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Procurar palavras-chave em todo o correio da conta (Ctrl+S)"
+#. / 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 "Registar fila de eventos IMAP"
 
-#: ../src/client/components/search-bar.vala:118
-#, c-format
-msgid "Indexing %s account"
-msgstr "A indexar a conta %s"
+#. / 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 "Registar serialização de rede"
 
-#: ../src/client/components/search-bar.vala:129
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Procurar na conta %s"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Registar atividade periódica"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "A enviar..."
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Registar consultas à base de dados (gera muitas mensagens)"
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_Aceitar"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Registar sincronização de pastas"
 
-#: ../src/client/components/stock.vala:19
-#: ../ui/edit_alternate_emails.glade.h:3 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Cancelar"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Permitir inspeção da vista web"
 
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Fechar"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Revogar todos os certificados do servidor com avisos TLS"
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Descartar"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Mostrar versão do programa"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Abrir"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Usar %s para abir uma janela de nova mensagem"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Imprimir..."
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Por favor, reporte comentários, sugestões e erros em:"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Remover"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Erro ao processar as opções da linha de comandos: %s\n"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "Selecionar _Tudo"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Opção de linha de comandos não reconhecida \"%s\"\n"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Manter"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - novas mensagens"
 
-#: ../src/client/composer/composer-widget.vala:73
-msgid "Saved"
-msgstr "Gravada"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d nova mensagem"
+msgstr[1] "%d novas mensagens"
 
-#: ../src/client/composer/composer-widget.vala:74
-msgid "Saving"
-msgstr "Gravação"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d nova mensagem"
+msgstr[1] "%s, %d novas mensagens"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "Error saving"
-msgstr "Erro ao gravar"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d outra nova mensagem para %s)"
+msgstr[1] ""
+"%s\n"
+"(%d outras novas mensagens para %s)"
 
-#: ../src/client/composer/composer-widget.vala:76
-msgid "Press Backspace to delete quote"
-msgstr "Prima Recuo para eliminar a citação"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Abrir"
 
-#: ../src/client/composer/composer-widget.vala:77
-msgid "New Message"
-msgstr "Nova mensagem"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Eu"
 
-#. A 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:138
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr "Ligação insegura: %s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
+"A identidade do servidor de correio %s em %s:%u não pôde ser verificada."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
 msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
-"anexar|a anexar|anexa|anexo|anexos|anexado|incluir|incluído|a incluir|inclui|"
-"inclusão|inclusões"
+"Selecionar \"Confiar neste servidor\" ou \"Confiar sempre neste servidor\" "
+"pode fazer com que o seu nome de utilizador e a sua senha sejam transmitidos "
+"sem segurança."
 
-#: ../src/client/composer/composer-widget.vala:1102
-#: ../src/client/composer/composer-widget.vala:1106
-msgid "Do you want to discard this message?"
-msgstr "Pretende descartar esta mensagem?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"Selecionar \"Não confiar neste servidor\" fará com que o Geary não aceda ao "
+"servidor."
 
-#: ../src/client/composer/composer-widget.vala:1262
-msgid "Send message with an empty subject and body?"
-msgstr "Enviar mensagem sem assunto e/ou texto?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "O Geary não adicionará ou atualizará esta conta de correio."
 
-#: ../src/client/composer/composer-widget.vala:1264
-msgid "Send message with an empty subject?"
-msgstr "Enviar mensagem sem assunto?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"Selecionar \"Não confiar neste servidor\" fará com que o Geary pare de "
+"aceder ao servidor."
 
-#: ../src/client/composer/composer-widget.vala:1266
-msgid "Send message with an empty body?"
-msgstr "Enviar mensagem sem qualquer texto?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr "O Geary vai encerrar se não tiver outras contas de correio abertas."
 
-#: ../src/client/composer/composer-widget.vala:1268
-msgid "Send message without an attachment?"
-msgstr "Enviar mensagem sem anexo?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Contacte o seu administrador de sistema ou fornecedor de serviço se tiver "
+"dúvidas acerca destes assuntos."
 
-#: ../src/client/composer/composer-widget.vala:1530
-msgid "Cannot add attachment"
-msgstr "Impossível adicionar o anexo"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
+"O certificado do servidor não está assinado por uma autoridade conhecida"
 
-#: ../src/client/composer/composer-widget.vala:1541
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "\"%s\" não foi encontrado."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr "A identidade do servidor não corresponde à identidade no certificado"
 
-#: ../src/client/composer/composer-widget.vala:1548
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" é uma pasta."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "O certificado do servidor expirou"
 
-#: ../src/client/composer/composer-widget.vala:1555
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" é um ficheiro vazio."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "O certificado do servidor não foi ativado"
 
-#: ../src/client/composer/composer-widget.vala:1569
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "Impossível abrir \"%s\" para leitura."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "O certificado do servidor foi revogado e é agora inválido"
 
-#: ../src/client/composer/composer-widget.vala:1576
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" já está anexado para envio."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "O certificado do servidor é considerado inseguro"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1585
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr "Ocorreu um erro ao processar o certificado do servidor"
 
-#: ../src/client/composer/composer-widget.vala:1645
-#| msgid "To: %s\n"
-msgid "To: "
-msgstr "Para: "
+#: ../src/client/dialogs/password-dialog.vala:16
+#| msgid "Please enter your email password"
+msgid "Geary requires your email password to continue"
+msgstr "O Geary necessita da sua senha para continuar"
 
-#: ../src/client/composer/composer-widget.vala:1648
-#| msgid "Cc: %s\n"
-msgid "Cc: "
-msgstr "Cc: "
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Escolha um ficheiro"
 
-#: ../src/client/composer/composer-widget.vala:1651
-#| msgid "Bcc:"
-msgid "Bcc: "
-msgstr "Bcc: "
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Anexar"
 
-#: ../src/client/composer/composer-widget.vala:1654
-#| msgid "_Reply"
-msgid "Reply-To: "
-msgstr "Responder a: "
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr "Endereços adicionais para %s"
 
-#: ../src/client/composer/composer-widget.vala:1887
-msgid "Select Color"
-msgstr "Escolha a cor"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Contas"
 
-#. 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:2322
-#, c-format
-msgid "%1$s via %2$s"
-msgstr "%1$s via %2$s"
+#. / 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 "Primeiro Último"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2364
-#| msgid "From:"
-msgid "_From:"
-msgstr "_De:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Boas vindas ao Geary."
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Eu"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Insira as informações de conta."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 semanas atrás"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 mês atrás"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 meses atrás"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 meses atrás"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 ano atrás"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+#| msgid "1 year back"
+msgid "2 years back"
+msgstr "2 anos atrás"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+#| msgid "1 year back"
+msgid "4 years back"
+msgstr "4 anos atrás"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Tudo"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "Editar"
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr "Antever"
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "_Lembrar senhas"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "_Lembrar senha"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Impossível validar:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; nome de conta inválido.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; endereço eletrónico já adicionado ao Geary.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; erro de ligação IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; utilizador ou senha IMAP inválidos.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; erro de ligação SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; utilizador ou senha SMTP inválidos.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; erro de ligação.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; utilizador ou senha inválidos.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Gravar"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Adicionar"
+
+#. / 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 "%b %-e"
+
+#. / 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 de %B de %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 de %B de %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 de %B de %Y, %-l:%M %P"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Agora"
+
+#: ../src/client/util/util-date.vala:167
+#| msgid "%dm ago"
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "Há %d minuto"
+msgstr[1] "Há %d minutos"
+
+#: ../src/client/util/util-date.vala:171
+#| msgid "%dh ago"
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "Há %d hora"
+msgstr[1] "Há %d horas"
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Ontem"
+
+#. / 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
+msgid "%A"
+msgstr "%A"
+
+#: ../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/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d mensagem"
+msgstr[1] "%d mensagens"
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d não lida"
+msgstr[1] "%d não lidas"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Caixas de entrada"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Procurar na conta %s"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+#| msgid "%d results"
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d resultado"
+msgstr[1] "%d resultados"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "Nenhuma conversa selecionada."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, c-format
 #| msgid "%u conversations selected."
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
@@ -1025,7 +1217,6 @@ msgid "Date:"
 msgstr "Data:"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, c-format
 #| msgid "%u read messages"
 msgid "%u read message"
 msgid_plural "%u read messages"
@@ -1033,33 +1224,30 @@ msgstr[0] "%u mensagem lida"
 msgstr[1] "%u mensagens lidas"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr "A mensagem foi enviada com sucesso, mas não pôde ser gravada em %s."
 
-#. Add a menu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Copiar"
 
-#. Add a menu item for copying the address.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "Copiar _Endereço eletrónico"
 
-#. Add a menu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Copiar _Ligação"
 
-#. Select message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "Selecionar _Mensagem"
 
-#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Selecionar _Tudo"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "_Inspecionar"
@@ -1072,10 +1260,9 @@ msgstr "Parece que esta ligação vai para"
 msgid "but actually goes to"
 msgstr "mas de fato vai para"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
-msgstr "(inválido?)"
+msgstr " (inválido?)"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1718
 msgid "_Save Image As..."
@@ -1095,12 +1282,10 @@ msgid_plural "Save All A_ttachments..."
 msgstr[0] "Gravar ane_Xo..."
 msgstr[1] "Gravar todos os ane_Xos..."
 
-#. Reply to all on a message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#. Mark as read/unread.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "_Marcar como lida"
@@ -1113,1113 +1298,665 @@ msgstr "_Marcar como não lida"
 msgid "Mark Unread From _Here"
 msgstr "Marcar como não lida a partir _Daqui"
 
-#. Separator.
-#. View original message source.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "_Ver código fonte"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:378
-msgid "none"
-msgstr "nenhum"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "Erro ao abrir o editor de texto predefinido."
 
 #: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s - inspetor de conversas"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Escolha um ficheiro"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Gravada"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Anexar"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Gravação"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
-msgid "Untrusted Connection: %s"
-msgstr "Ligação insegura: %s"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Erro ao gravar"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
-msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr ""
-"A identidade do servidor de correio %s em %s:%u não pôde ser verificada."
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "Prima Recuo para eliminar a citação"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
-msgid ""
-"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-"your username and password to be transmitted insecurely."
-msgstr ""
-"Selecionar \"Confiar neste servidor\" ou \"Confiar sempre neste servidor\" "
-"pode fazer com que o seu nome de utilizador e a sua senha sejam transmitidos "
-"sem segurança."
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Nova mensagem"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-"server."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Selecionar \"Não confiar neste servidor\" fará com que o Geary não aceda ao "
-"servidor."
+"anexar|a anexar|anexa|anexo|anexos|anexado|incluir|incluído|a "
+"incluir|inclui|inclusão|inclusões"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
-msgid "Geary will not add or update this email account."
-msgstr "O Geary não adicionará ou atualizará esta conta de correio."
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Pretende descartar esta mensagem?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-"this account."
-msgstr ""
-"Selecionar \"Não confiar neste servidor\" fará com que o Geary pare de "
-"aceder ao servidor."
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Enviar mensagem sem assunto e/ou texto?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr "O Geary vai encerrar se não tiver outras contas de correio abertas."
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Enviar mensagem sem assunto?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
-msgid ""
-"Contact your system administrator or email service provider if you have any "
-"question about these issues."
-msgstr ""
-"Contacte o seu administrador de sistema ou fornecedor de serviço se tiver "
-"dúvidas acerca destes assuntos."
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Enviar mensagem sem qualquer texto?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
-msgstr ""
-"O certificado do servidor não está assinado por uma autoridade conhecida"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Enviar mensagem sem anexo?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
-msgid "The server's identity does not match the identity in the certificate"
-msgstr "A identidade do servidor não corresponde à identidade no certificado"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Impossível adicionar o anexo"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
-msgid "The server's certificate has expired"
-msgstr "O certificado do servidor expirou"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "\"%s\" não foi encontrado."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
-msgid "The server's certificate has not been activated"
-msgstr "O certificado do servidor não foi ativado"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" é uma pasta."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
-msgid "The server's certificate has been revoked and is now invalid"
-msgstr "O certificado do servidor foi revogado e é agora inválido"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" é um ficheiro vazio."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
-msgid "The server's certificate is considered insecure"
-msgstr "O certificado do servidor é considerado inseguro"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "Impossível abrir \"%s\" para leitura."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
-msgid "An error has occurred processing the server's certificate"
-msgstr "Ocorreu um erro ao processar o certificado do servidor"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "\"%s\" já está anexado para envio."
 
-#. 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 "O Geary necessita da sua senha para continuar"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. 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 mensagem"
-msgstr[1] "%d mensagens"
+#: ../src/client/composer/composer-widget.vala:1645
+#| msgid "To: %s\n"
+msgid "To: "
+msgstr "Para: "
 
-#. / 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 não lida"
-msgstr[1] "%d não lidas"
+#: ../src/client/composer/composer-widget.vala:1648
+#| msgid "Cc: %s\n"
+msgid "Cc: "
+msgstr "Cc: "
 
-#. / 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/composer/composer-widget.vala:1651
+#| msgid "Bcc:"
+msgid "Bcc: "
+msgstr "Bcc: "
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Caixas de entrada"
+#: ../src/client/composer/composer-widget.vala:1654
+#| msgid "_Reply"
+msgid "Reply-To: "
+msgstr "Responder a: "
 
-#: ../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 resultado"
-msgstr[1] "%d resultados"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Escolha a cor"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - novas mensagens"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr "%1$s via %2$s"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d nova mensagem"
-msgstr[1] "%d novas mensagens"
+#: ../src/client/composer/composer-widget.vala:2364
+#| msgid "From:"
+msgid "_From:"
+msgstr "_De:"
 
-#: ../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 nova mensagem"
-msgstr[1] "%s, %d novas mensagens"
+#: ../src/client/components/main-window.vala:388
+#| msgid "%s (%s)"
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 outra nova mensagem para %s)"
-msgstr[1] ""
-"%s\n"
-"(%d outras novas mensagens para %s)"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "A enviar..."
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Abrir"
+#: ../src/client/components/conversation-find-bar.vala:214
+#| msgid "%i matches"
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i ocorrência"
+msgstr[1] "%i ocorrências"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:216
+#| msgid "%i matches"
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i ocorrência"
+msgstr[1] "%i ocorrências"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "não encontrado"
 
-#. / 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"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_Aceitar"
 
-#. / 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 "%b %-e"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#. / 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"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Fechar"
 
-#. / 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 de %B de %Y %-l:%M %P"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Descartar"
 
-#. / 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 de %B de %Y %-H:%M"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Abrir"
 
-#. / 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 de %B de %Y, %-l:%M %P"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Imprimir..."
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Agora"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Remover"
 
-#: ../src/client/util/util-date.vala:167
-#, c-format
-#| msgid "%dm ago"
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "Há %d minuto"
-msgstr[1] "Há %d minutos"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Manter"
 
-#: ../src/client/util/util-date.vala:171
-#, c-format
-#| msgid "%dh ago"
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "Há %d hora"
-msgstr[1] "Há %d horas"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Procurar palavras-chave em todo o correio da conta (Ctrl+S)"
 
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "Ontem"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "A indexar a conta %s"
 
-#. / 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"
+#~| msgid "Geary Mail"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(sem assunto)"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary Mail"
 
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "bytes"
+#~ msgid "Send and receive email"
+#~ msgstr "Enviar e receber mensagens"
 
-#: ../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Email;E-mail;Mail;"
 
-#: ../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#~ msgid "Compose Message"
+#~ msgstr "Escrever mensagem"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#~| msgid "Send and receive email"
+#~ msgid "Send by email"
+#~ msgstr "Enviar por email"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#~ msgid "Send files using Geary"
+#~ msgstr "Enviar ficheiros com o Geary"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#~ msgid "_Donate"
+#~ msgstr "_Doar"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">A conta não pode ser removida</span> "
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Neste momento, esta conta está associada a uma janela de composição. Envie "
+#~ "ou descarte a mensagem e tente novamente."
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Outro"
+#~ msgid "Add account"
+#~ msgstr "Adicionar conta"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#~ msgid "Edit account"
+#~ msgstr "Editar conta"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#~ msgid "Remove account"
+#~ msgstr "Remover conta"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Entrada"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Por favor, aguarde enquanto o Geary valida a sua conta."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Rascunhos"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Ligação insegura"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Enviadas"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "Confiar _Sempre neste servidor"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Com estrela"
+#~ msgid "_Trust This Server"
+#~ msgstr "_Confiar neste servidor"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Importante"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "_Não confiar neste servidor"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Todo o correio"
+#~ msgid "_Undo"
+#~ msgstr "Desfa_Zer"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Não solicitado"
+#~ msgid "_Redo"
+#~ msgstr "_Refazer"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Lixo"
+#~ msgid "Cu_t"
+#~ msgstr "Cor_Tar"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Saída"
+#~ msgid "_Paste"
+#~ msgstr "Co_Lar"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Arquivo"
+#~ msgid "_Left"
+#~ msgstr "_Esquerda"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-msgstr "Nenhum"
+#~ msgid "_Right"
+#~ msgstr "_Direita"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-#| msgid "Save A_ttachment..."
-#| msgid_plural "Save All A_ttachments..."
-msgid "attachment"
-msgstr "anexo"
+#~ msgid "_Center"
+#~ msgstr "_Centro"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
-msgstr "bcc"
+#~ msgid "_Justify"
+#~ msgstr "_Justificar"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
-msgstr "corpo"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Ligação (Ctrl+L)"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-#| msgid "Bcc:"
-msgid "cc"
-msgstr "cc"
+#~ msgid "C_olor"
+#~ msgstr "C_Or"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
-msgstr "de"
+#~ msgid "More options"
+#~ msgstr "Mais opções"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-#| msgid "Subject:"
-msgid "subject"
-msgstr "assunto"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Citar texto  (Ctrl+])"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
-msgstr "para"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Remover citação de texto (Ctrl+[)"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
-msgstr "eu"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Remover formatação (Ctrl+Barra de espaço)"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-#| msgid "Drafts"
-msgid "Drafts | Draft"
-msgstr "Rascunhos | Rascunho"
+#~| msgid "Paste _With Formatting"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "_Colar com formatação"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "Enviadas | Correio enviado | Emails enviados | E-mails enviados"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Negrito (Ctrl+B)"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
-msgstr ""
-"Não solicitado | Spam | Sucata | Lixo eletrónico | Correio em massa | Emails "
-"em massa | E-mails em massa"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Itálico (Ctrl+I)"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Lixo | Lixeira"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Sublinhado (Ctrl+U)"
 
-#. List of folder names to match for Archive, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
-msgid "Archive | Archives"
-msgstr "Arquivos | Arquivos"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Rasurado (Ctrl+K)"
 
-#. / 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:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %-e de %b de %Y às %-H:%M"
+#~ msgid "_Rich Text"
+#~ msgstr "_Texto melhorado"
 
-#. / 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:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "Em %1$s, %2$s escreveu:"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Mostrar campos estendidos"
 
-#. / 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:228
-#, c-format
-msgid "%s wrote:"
-msgstr "%s escreveu:"
+#~ msgctxt "Label"
+#~ msgid "Close and Save"
+#~ msgstr "Fechar e gravar"
 
-#. / 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:234
-#, c-format
-msgid "On %s:"
-msgstr "Em %s:"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "Fechar e gravar"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "-------- Mensagem reencaminhada --------"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "Fechar e gravar"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "De: %s\n"
+#~ msgctxt "Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Fechar e descartar"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Assunto: %s\n"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Fechar e descartar"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "Data: %s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "Fechar e descartar"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "Para: %s\n"
+#~ msgid "Lar_ge"
+#~ msgstr "_Grande"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Cc: %s\n"
+#~ msgid "Large"
+#~ msgstr "Grande"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">A conta não pode ser removida</span> "
+#~ msgid "_Medium"
+#~ msgstr "_Médio"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Neste momento, esta conta está associada a uma janela de composição. Envie "
-"ou descarte a mensagem e tente novamente."
+#~ msgid "Medium"
+#~ msgstr "Médio"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Adicionar conta"
+#~ msgid "_Small"
+#~ msgstr "_Pequeno"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Editar conta"
+#~ msgid "Small"
+#~ msgstr "Pequeno"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Remover conta"
+#~ msgid "S_ans Serif"
+#~ msgstr "S_Ans Serif"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Por favor, aguarde enquanto o Geary valida a sua conta."
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Ligação insegura"
+#~ msgid "S_erif"
+#~ msgstr "S_Erif"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "Confiar _Sempre neste servidor"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "_Confiar neste servidor"
+#~ msgid "_Fixed Width"
+#~ msgstr "Largura _Fixa"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "_Não confiar neste servidor"
-
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "Desfa_Zer"
-
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Refazer"
-
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "Cor_Tar"
-
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "Co_Lar"
-
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Esquerda"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Direita"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Centro"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Justificar"
-
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Ligação (Ctrl+L)"
-
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "C_Or"
-
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Mais opções"
-
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Citar texto  (Ctrl+])"
-
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Remover citação de texto (Ctrl+[)"
-
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Remover formatação (Ctrl+Barra de espaço)"
-
-#: ../ui/composer.glade.h:16
-#| msgid "Paste _With Formatting"
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "_Colar com formatação"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Negrito (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Itálico (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Sublinhado (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Rasurado (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "_Texto melhorado"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Mostrar campos estendidos"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "Fechar e gravar"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "Fechar e gravar"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "Fechar e gravar"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "Fechar e descartar"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "Fechar e descartar"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "Fechar e descartar"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "_Grande"
-
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "Grande"
-
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "_Médio"
-
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "Médio"
-
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "_Pequeno"
-
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "Pequeno"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "S_Ans Serif"
-
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "S_Erif"
-
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "Serif"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "Largura _Fixa"
-
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "Largura fixa"
-
-#: ../ui/composer.glade.h:42
-#| msgid "_Attach"
-msgid "Detach"
-msgstr "Desanexar"
-
-#: ../ui/composer.glade.h:43
-#| msgid "Italic (Ctrl+I)"
-msgid "Detach (Ctrl+D)"
-msgstr "Desanexar (Ctrl+D)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_Enviar"
-
-#: ../ui/composer.glade.h:45
-#| msgid "_Send"
-msgid "Send"
-msgstr "Enviar"
-
-#: ../ui/composer.glade.h:46
-#| msgid "Bold (Ctrl+B)"
-msgid "Send (Ctrl+Enter)"
-msgstr "Enviar (Ctrl+Enter)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "_Anexar ficheiro"
-
-#: ../ui/composer.glade.h:48
-#| msgid "_Attach File"
-msgid "Attach File"
-msgstr "Anexar ficheiro"
-
-#: ../ui/composer.glade.h:49
-msgid "_Include Original Attachments"
-msgstr "_Incluir anexos originais"
-
-#: ../ui/composer.glade.h:50
-#| msgid "_Include Original Attachments"
-msgid "Include Original Attachments"
-msgstr "Incluir anexos originais"
-
-#: ../ui/composer.glade.h:51
-msgid "Application Menu"
-msgstr "Menu da aplicação"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:53
-#| msgid "To:"
-msgid "_To"
-msgstr "_Para"
-
-#: ../ui/composer.glade.h:54
-#| msgid "Cc:"
-msgid "_Cc"
-msgstr "_Cc"
-
-#: ../ui/composer.glade.h:55
-#| msgid "Subject:"
-msgid "_Subject"
-msgstr "_Assunto"
+#~ msgid "Fixed Width"
+#~ msgstr "Largura fixa"
 
-#: ../ui/composer.glade.h:56
-msgid "_Bcc"
-msgstr "_Bcc"
+#~| msgid "_Attach"
+#~ msgid "Detach"
+#~ msgstr "Desanexar"
 
-#: ../ui/composer.glade.h:57
-#| msgid "_Reply"
-msgid "_Reply-To"
-msgstr "_Responder a"
+#~| msgid "Italic (Ctrl+I)"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Desanexar (Ctrl+D)"
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:59
-#| msgid "From:"
-msgid "From"
-msgstr "De"
+#~ msgid "_Send"
+#~ msgstr "_Enviar"
 
-#: ../ui/composer.glade.h:60
-msgid "Drop files here"
-msgstr "Largar ficheiros aqui"
+#~| msgid "_Send"
+#~ msgid "Send"
+#~ msgstr "Enviar"
 
-#: ../ui/composer.glade.h:61
-msgid "To add them as attachments"
-msgstr "Para os adicionar como anexos"
+#~| msgid "Bold (Ctrl+B)"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Enviar (Ctrl+Enter)"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-#| msgid "Email address:"
-msgid "Remove email address"
-msgstr "Remover endereço eletrónico"
+#~ msgid "_Attach File"
+#~ msgstr "_Anexar ficheiro"
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"Alguns serviços de correio requerem endereços adicionais configurados no "
-"servidor. Contacte o seu fornecedor de serviço para mais informação."
-
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "_Atualizar"
-
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Localizar:"
-
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Anterior"
-
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Seguinte"
-
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Sensível a maiúsculas"
-
-#: ../ui/find_bar.glade.h:5
-#| msgid "Labels"
-msgid "label"
-msgstr "etiqueta"
-
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Senha"
-
-#: ../ui/login.glade.h:2
-#| msgid "E_mail address:"
-msgid "E_mail address"
-msgstr "E_Ndereço eletrónico"
-
-#: ../ui/login.glade.h:3
-#| msgid "_Password:"
-msgid "_Password"
-msgstr "_Senha"
-
-#: ../ui/login.glade.h:4
-#| msgid "S_ervice:"
-msgid "S_ervice"
-msgstr "S_Erviço"
-
-#: ../ui/login.glade.h:5
-#| msgid "N_ame:"
-msgid "N_ame"
-msgstr "N_Ome"
-
-#: ../ui/login.glade.h:7
-#| msgid "N_ickname:"
-msgid "N_ickname"
-msgstr "A_Lcunha"
-
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Profissional, pessoal..."
-
-#: ../ui/login.glade.h:9
-#| msgid "Sent Mail"
-msgid "_Save sent mail"
-msgstr "_Gravar correio enviado"
-
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
-msgstr "Endereços de email adicionais…"
-
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "Definições IMAP"
-
-#: ../ui/login.glade.h:12
-#| msgid "Se_rver:"
-msgid "Se_rver"
-msgstr "Se_Rvidor"
-
-#: ../ui/login.glade.h:13
-#| msgid "P_ort:"
-msgid "P_ort"
-msgstr "P_Orta"
-
-#: ../ui/login.glade.h:14
-#| msgid "Ser_ver:"
-msgid "Ser_ver"
-msgstr "Ser_Vidor"
-
-#: ../ui/login.glade.h:15
-#| msgid "Por_t:"
-msgid "Por_t"
-msgstr "Por_Ta"
-
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "Definições SMTP"
-
-#: ../ui/login.glade.h:17
-#| msgid "User_name:"
-msgid "User_name"
-msgstr "_Nome de utilizador"
-
-#: ../ui/login.glade.h:18
-#| msgid "Pass_word:"
-msgid "Pass_word"
-msgstr "_Senha:"
-
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr "Utilizador SMTP"
-
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr "Senha SMTP"
-
-#: ../ui/login.glade.h:21
-#| msgid "_Username:"
-msgid "_Username"
-msgstr "_Utilizador"
-
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr "Utilizador IMAP"
-
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr "Senha IMAP"
-
-#: ../ui/login.glade.h:24
-#| msgid "Encr_yption:"
-msgid "Encr_yption"
-msgstr "En_Criptação"
-
-#: ../ui/login.glade.h:25
-#| msgid "Encrypt_ion:"
-msgid "Encrypt_ion"
-msgstr "Encr_Iptação"
-
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
-
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "STARTTLS"
-
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "Não re_Quer autenticação"
-
-#: ../ui/login.glade.h:30
-#| msgid "IMAP Credentials"
-msgid "Use IMAP cre_dentials"
-msgstr "Usar credenciais IMAP"
-
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Compositor"
-
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr "Gravar _Rascunhos no servidor"
-
-#: ../ui/login.glade.h:33
-msgid "Si_gn emails (HTML allowed):"
-msgstr "_Assinar emails (HTML permitido):"
-
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "Armazenamento"
-
-#: ../ui/login.glade.h:35
-#| msgid "_Download mail:"
-msgid "_Download mail"
-msgstr "_Receber correio"
-
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "Credenciais SMTP"
-
-#: ../ui/password-dialog.glade.h:2
-#| msgid "Username:"
-msgid "Username"
-msgstr "Utilizador"
-
-#: ../ui/password-dialog.glade.h:4
-#| msgid "_Remember passwords"
-msgid "_Remember password"
-msgstr "_Relembrar senha"
-
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Autenticar"
-
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "A ler"
-
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "Selecionar mensagem seguinte _Automaticamente"
-
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "_Mostrar antevisão da conversa"
-
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr "Usar vista de _Três painéis"
-
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "Ativar verificação _Ortográfica"
-
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "Notificações"
-
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "_Reproduzir som nas notificações"
-
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "Mostrar _Notificações de novas mensagens"
-
-#: ../ui/preferences.glade.h:10
-#| msgid "Show _notifications for new mail"
-msgid "Always _watch for new mail"
-msgstr "_Procurar sempre novas mensagens"
-
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr "O Geary é executado em 2º plano e notifica-o de novas mensagens"
-
-#: ../ui/preferences.glade.h:12
-#| msgid "_Preferences"
-msgid "Preferences"
-msgstr "Preferências"
-
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Tem a certeza que quer remover esta "
-"conta?</span> "
+#~| msgid "_Attach File"
+#~ msgid "Attach File"
+#~ msgstr "Anexar ficheiro"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Todas as mensagens associadas a esta conta serão removidas. As mensagens no "
-"servidor não sofrem alterações."
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Incluir anexos originais"
+
+#~| msgid "_Include Original Attachments"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Incluir anexos originais"
+
+#~ msgid "Application Menu"
+#~ msgstr "Menu da aplicação"
+
+#~| msgid "To:"
+#~ msgid "_To"
+#~ msgstr "_Para"
+
+#~| msgid "Cc:"
+#~ msgid "_Cc"
+#~ msgstr "_Cc"
+
+#~| msgid "Subject:"
+#~ msgid "_Subject"
+#~ msgstr "_Assunto"
+
+#~ msgid "_Bcc"
+#~ msgstr "_Bcc"
+
+#~| msgid "_Reply"
+#~ msgid "_Reply-To"
+#~ msgstr "_Responder a"
+
+#~| msgid "From:"
+#~ msgid "From"
+#~ msgstr "De"
+
+#~ msgid "Drop files here"
+#~ msgstr "Largar ficheiros aqui"
+
+#~ msgid "To add them as attachments"
+#~ msgstr "Para os adicionar como anexos"
+
+#~| msgid "Email address:"
+#~ msgid "Remove email address"
+#~ msgstr "Remover endereço eletrónico"
+
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "Alguns serviços de correio requerem endereços adicionais configurados no "
+#~ "servidor. Contacte o seu fornecedor de serviço para mais informação."
+
+#~ msgid "_Update"
+#~ msgstr "_Atualizar"
+
+#~ msgid "Find:"
+#~ msgstr "Localizar:"
+
+#~ msgid "_Previous"
+#~ msgstr "_Anterior"
+
+#~ msgid "_Next"
+#~ msgstr "_Seguinte"
+
+#~ msgid "_Case sensitive"
+#~ msgstr "_Sensível a maiúsculas"
+
+#~| msgid "Labels"
+#~ msgid "label"
+#~ msgstr "etiqueta"
+
+#~ msgid "Password"
+#~ msgstr "Senha"
+
+#~| msgid "E_mail address:"
+#~ msgid "E_mail address"
+#~ msgstr "E_Ndereço eletrónico"
+
+#~| msgid "_Password:"
+#~ msgid "_Password"
+#~ msgstr "_Senha"
+
+#~| msgid "S_ervice:"
+#~ msgid "S_ervice"
+#~ msgstr "S_Erviço"
+
+#~| msgid "N_ame:"
+#~ msgid "N_ame"
+#~ msgstr "N_Ome"
+
+#~| msgid "N_ickname:"
+#~ msgid "N_ickname"
+#~ msgstr "A_Lcunha"
+
+#~ msgid "Work, Home, etc."
+#~ msgstr "Profissional, pessoal..."
+
+#~| msgid "Sent Mail"
+#~ msgid "_Save sent mail"
+#~ msgstr "_Gravar correio enviado"
+
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "Endereços de email adicionais…"
+
+#~ msgid "IMAP settings"
+#~ msgstr "Definições IMAP"
+
+#~| msgid "Se_rver:"
+#~ msgid "Se_rver"
+#~ msgstr "Se_Rvidor"
+
+#~| msgid "P_ort:"
+#~ msgid "P_ort"
+#~ msgstr "P_Orta"
+
+#~| msgid "Ser_ver:"
+#~ msgid "Ser_ver"
+#~ msgstr "Ser_Vidor"
+
+#~| msgid "Por_t:"
+#~ msgid "Por_t"
+#~ msgstr "Por_Ta"
+
+#~ msgid "SMTP settings"
+#~ msgstr "Definições SMTP"
+
+#~| msgid "User_name:"
+#~ msgid "User_name"
+#~ msgstr "_Nome de utilizador"
+
+#~| msgid "Pass_word:"
+#~ msgid "Pass_word"
+#~ msgstr "_Senha:"
+
+#~ msgid "SMTP username"
+#~ msgstr "Utilizador SMTP"
+
+#~ msgid "SMTP password"
+#~ msgstr "Senha SMTP"
+
+#~| msgid "_Username:"
+#~ msgid "_Username"
+#~ msgstr "_Utilizador"
+
+#~ msgid "IMAP username"
+#~ msgstr "Utilizador IMAP"
+
+#~ msgid "IMAP password"
+#~ msgstr "Senha IMAP"
+
+#~| msgid "Encr_yption:"
+#~ msgid "Encr_yption"
+#~ msgstr "En_Criptação"
+
+#~| msgid "Encrypt_ion:"
+#~ msgid "Encrypt_ion"
+#~ msgstr "Encr_Iptação"
+
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
+
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
+
+#~ msgid "No authentication re_quired"
+#~ msgstr "Não re_Quer autenticação"
+
+#~| msgid "IMAP Credentials"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Usar credenciais IMAP"
+
+#~ msgid "Composer"
+#~ msgstr "Compositor"
+
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Gravar _Rascunhos no servidor"
+
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "_Assinar emails (HTML permitido):"
+
+#~ msgid "Storage"
+#~ msgstr "Armazenamento"
+
+#~| msgid "_Download mail:"
+#~ msgid "_Download mail"
+#~ msgstr "_Receber correio"
+
+#~ msgid "SMTP Credentials"
+#~ msgstr "Credenciais SMTP"
+
+#~| msgid "Username:"
+#~ msgid "Username"
+#~ msgstr "Utilizador"
+
+#~| msgid "_Remember passwords"
+#~ msgid "_Remember password"
+#~ msgstr "_Relembrar senha"
+
+#~ msgid "_Authenticate"
+#~ msgstr "_Autenticar"
+
+#~ msgid "Reading"
+#~ msgstr "A ler"
+
+#~ msgid "_Automatically select next message"
+#~ msgstr "Selecionar mensagem seguinte _Automaticamente"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Mostrar antevisão da conversa"
+
+#~ msgid "Use _three pane view"
+#~ msgstr "Usar vista de _Três painéis"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Ativar verificação _Ortográfica"
+
+#~ msgid "Notifications"
+#~ msgstr "Notificações"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Reproduzir som nas notificações"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Mostrar _Notificações de novas mensagens"
+
+#~| msgid "Show _notifications for new mail"
+#~ msgid "Always _watch for new mail"
+#~ msgstr "_Procurar sempre novas mensagens"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr "O Geary é executado em 2º plano e notifica-o de novas mensagens"
+
+#~| msgid "_Preferences"
+#~ msgid "Preferences"
+#~ msgstr "Preferências"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Tem a certeza que quer remover esta "
+#~ "conta?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Todas as mensagens associadas a esta conta serão removidas. As mensagens no "
+#~ "servidor não sofrem alterações."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Alcunha:"
+#~ msgid "Nickname:"
+#~ msgstr "Alcunha:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Endereço eletrónico:"
+#~ msgid "Email address:"
+#~ msgstr "Endereço eletrónico:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Atualização do Geary em curso…"
+#~ msgid "Geary update in progress…"
+#~ msgstr "Atualização do Geary em curso…"
 
 #~ msgid "Archive conversation (Delete, Backspace, A)"
 #~ msgstr "Arquivar conversa (Delete, Backspace, A)"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7735c26..d947b83 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -18,423 +18,427 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-01-03 17:54+0000\n"
-"PO-Revision-Date: 2015-01-03 22:50-0300\n"
-"Last-Translator: Rafael Ferreira <rafael f f1 gmail com>\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:10+0000\n"
+"Last-Translator: Rafael Ferreira <Unknown>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list gnome org>\n"
-"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.7.1\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Cliente de e-mail"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Correio eletrônico - Geary"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Enviar e receber e-mail"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Mail;Correio eletrônico;e-mails;mensagens;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Escrever mensagem"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:56+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: pt_BR\n"
 
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Enviar por e-mail"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Rascunhos | Rascunho"
 
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Envia arquivos usando Geary"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr "Enviados | Correios enviados | E-mails enviados"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Salvar"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr "Spam | Lixo eletrônico"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Adicionar"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Lixeira | Lixo"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:20
-msgid "Accounts"
-msgstr "Contas"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#. Copyright 2011-2014 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Primeiro Último"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Caixa de entrada"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-msgid "Welcome to Geary."
-msgstr "Bem-vindo ao Geary"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Rascunhos"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-msgid "Enter your account information to get started."
-msgstr "Entre com as informações de sua conta para iniciar."
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "E-mails enviados"
 
-#: ../src/client/accounts/add-edit-page.vala:247
-msgid "2 weeks back"
-msgstr "2 semanas atrás"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Com estrela"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:248
-msgid "1 month back"
-msgstr "1 mês atrás"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Importante"
 
-#: ../src/client/accounts/add-edit-page.vala:249
-msgid "3 months back"
-msgstr "3 meses atrás"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Todos os e-mails"
 
-#: ../src/client/accounts/add-edit-page.vala:250
-msgid "6 months back"
-msgstr "6 meses atrás"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Spam"
 
-#: ../src/client/accounts/add-edit-page.vala:251
-msgid "1 year back"
-msgstr "1 ano atrás"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Lixeira"
 
-#: ../src/client/accounts/add-edit-page.vala:252
-msgid "2 years back"
-msgstr "2 anos atrás"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Caixa de saída"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "4 years back"
-msgstr "4 anos atrás"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Pesquisar"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "Everything"
-msgstr "Tudo"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Arquivar"
 
-#: ../src/client/accounts/add-edit-page.vala:686
-msgid "Remem_ber passwords"
-msgstr "Lem_brar senhas"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Nenhum"
 
-#: ../src/client/accounts/add-edit-page.vala:693 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "Lem_brar senha"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:727
-msgid "Unable to validate:\n"
-msgstr "Incapaz de validar:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:729
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "&#8226; Apelido de conta inválido.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:732
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; Endereço de e-mail já adicionado ao Geary.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:736
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "&#8226; Erro de conexão ao IMAP.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:739
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "&#8226; Nome de usuário ou senha de IMAP incorretos.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Outro"
 
-#: ../src/client/accounts/add-edit-page.vala:742
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "&#8226; Erro de conexão ao SMTP.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "anexo"
 
-#: ../src/client/accounts/add-edit-page.vala:745
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "&#8226; Nome de usuário ou senha SMTP incorretos.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "cco"
 
-#: ../src/client/accounts/add-edit-page.vala:749
-msgid "        &#8226; Connection error.\n"
-msgstr "&#8226; Erro de conexão.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "corpo"
 
-#: ../src/client/accounts/add-edit-page.vala:753
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "&#8226; Nome de usuário ou senha incorretos.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "cc"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2014 Yorba Foundation"
-msgstr "Copyright 2011-2014 Yorba Foundation"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "de"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Visite o website da Yorba"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "assunto"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Iniciar Geary com a janela prinicipal oculta"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "para"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Informações de depuração de saída"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "eu"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Gravar monitoramento de conversação"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(sem assunto)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Deserialização do log de rede"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %b %-e, %Y em %-l:%M %p"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Registrar atividade de rede"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "Em %1$s, %2$s escreveu:"
 
-#. / 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 "Gravar lista de repetição do IMAP"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s escreveu:"
 
-#. / 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 "Registrar serialização de rede"
+#. / 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:234
+msgid "On %s:"
+msgstr "Em %s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Registrar atividade periódica"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Mensagem encaminhada ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Registrar consultas ao banco de dados (gera muitas mensagens)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "De: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Registrar normalização de pasta"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Assunto: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Permitir inspeção do WebView"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Data: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Revogar todos os certificados de servidor com avisos de TLS"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Para: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Mostrar versão do programa"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Cc: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Usar %s para abrir uma nova janela de redator"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "nenhum"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Por favor, envie sugestões, comentários ou bugs para:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Cliente de e-mail"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Falha ao analisar as opções de linha de comando: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Opção de linha de comando não reconhecida \"%s\"\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Visite o website da Yorba"
 
-#: ../src/client/application/geary-controller.vala:56
-msgid "_Delete"
-msgstr "E_xcluir"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Excluir a conversa (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Excluir as conversas (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:62
-msgid "_Trash"
-msgstr "Li_xeira"
-
-#: ../src/client/application/geary-controller.vala:63
-msgid "Move conversation to trash (Delete, Backspace)"
-msgstr "Mover conversa para a lixeira (Delete, Backspace)"
-
-#: ../src/client/application/geary-controller.vala:64
-msgid "Move conversations to trash (Delete, Backspace)"
-msgstr "Mover conversas para a lixeira (Delete, Backspace)"
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr ""
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
 #: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Arquivar"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Arquivar conversa (A)"
 
-#: ../src/client/application/geary-controller.vala:70
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Arquivar conversas (A)"
 
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Marcar como S_pam"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Marcar como não S_pam"
 
-#: ../src/client/application/geary-controller.vala:76
-#: ../src/client/application/geary-controller.vala:296
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Marcar conversação"
 
-#: ../src/client/application/geary-controller.vala:77
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Marcar conversas"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Adicionar marcador à conversa"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Adicionar marcador às conversas"
 
-#: ../src/client/application/geary-controller.vala:80
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Mover conversa"
 
-#: ../src/client/application/geary-controller.vala:81
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Mover conversas"
 
-#: ../src/client/application/geary-controller.vala:272
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "_Contas"
 
-#: ../src/client/application/geary-controller.vala:277
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../src/client/application/geary-controller.vala:281
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../src/client/application/geary-controller.vala:285
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../src/client/application/geary-controller.vala:289
-msgid "_Donate"
-msgstr "_Doação"
-
-#: ../src/client/application/geary-controller.vala:293
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Fechar"
 
-#: ../src/client/application/geary-controller.vala:298
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Marcar como..."
 
-#: ../src/client/application/geary-controller.vala:304
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Marcar como L_ido"
 
-#: ../src/client/application/geary-controller.vala:310
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Marcar como N_ão Lido"
 
-#: ../src/client/application/geary-controller.vala:316
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Marcar estrela"
 
-#: ../src/client/application/geary-controller.vala:321
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "_Tirar estrela"
 
-#: ../src/client/application/geary-controller.vala:331
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Adicionar etiqueta"
 
-#: ../src/client/application/geary-controller.vala:332
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Selo"
 
-#: ../src/client/application/geary-controller.vala:336
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../src/client/application/geary-controller.vala:340
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Compor nova mensagem (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:344
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1751
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../src/client/application/geary-controller.vala:345
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Responder (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:349
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "R_esponder tudo"
 
-#: ../src/client/application/geary-controller.vala:350
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Responder tudo (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:355
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1761
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Encaminhar"
 
-#: ../src/client/application/geary-controller.vala:356
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Encaminhar (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:624
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Não foi possível armazenar exceção de confiança de servidor"
 
-#: ../src/client/application/geary-controller.vala:861
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Suas configurações são inseguras"
 
-#: ../src/client/application/geary-controller.vala:862
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -444,17 +448,17 @@ msgstr ""
 "significa que seu usuário e senha poderão ser lidos por outra pessoa na "
 "rede. Você tem certeza que deseja fazer isso?"
 
-#: ../src/client/application/geary-controller.vala:863
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "Co_ntinuar"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:941
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Erro ao enviar e-mail"
 
-#: ../src/client/application/geary-controller.vala:942
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -462,14 +466,12 @@ msgstr ""
 "O Geary encontrou um erro ao enviar um e-mail. Se o problema persistir, por "
 "favor exclua manualmente o e-mail da sua pasta Caixa de saída."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:946
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Erro ao salvar e-mail"
 
-#: ../src/client/application/geary-controller.vala:947
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -477,20 +479,15 @@ msgstr ""
 "O Geary encontrou um erro ao salvar um e-mail na pasta de Correios enviados. "
 "A mensagem vai permanecer em sua pasta Caixa de saída até você excluí-la."
 
-#: ../src/client/application/geary-controller.vala:1016
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Rótulos"
 
-#. 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:1028
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Incapaz de abrir o banco de dados para %s"
 
-#: ../src/client/application/geary-controller.vala:1029
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -514,21 +511,19 @@ msgstr ""
 "Reconstruir o banco de dados irá destruir todos e-mails locais e seus "
 "anexos. <b>Os e-mails no seu servidor não serão afetados.</b>"
 
-#: ../src/client/application/geary-controller.vala:1031
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "_Reconstruir"
 
-#: ../src/client/application/geary-controller.vala:1031
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "S_air"
 
-#: ../src/client/application/geary-controller.vala:1040
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Incapaz de reconstruir o banco de dados para \"%s\""
 
-#: ../src/client/application/geary-controller.vala:1041
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -538,17 +533,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1063
-#: ../src/client/application/geary-controller.vala:1073
-#: ../src/client/application/geary-controller.vala:1084
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Incapaz de abrir a caixa de e-mail local para %s"
 
-#: ../src/client/application/geary-controller.vala:1064
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -564,9 +555,9 @@ msgstr ""
 "Por favor, verifique se você tem permissão de leitura/gravação para todos os "
 "arquivos neste diretório:\n"
 "\n"
-"%s "
+"%s"
 
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -580,7 +571,7 @@ msgstr ""
 "\n"
 "Por favor, instale a última versão do Geary e tente outra vez."
 
-#: ../src/client/application/geary-controller.vala:1085
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -592,26 +583,31 @@ msgstr ""
 "\n"
 "Por favor, verifique sua conexão de rede e reinicie o Geary."
 
-#: ../src/client/application/geary-controller.vala:1592
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "Sobre %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1595
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
 msgstr ""
 "Leonardo Lemos <leonardolemos live com>\n"
 "Fábio Nogueira <fnogueira gnome org>\n"
-"Enrico Nicoletto <liverig gmail com>."
+"Enrico Nicoletto <liverig gmail com>.\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Rafael Ferreira https://launchpad.net/~rafael-f-f1-s";
+
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1859
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Você tem certeza de que deseja abrir \"%s\"?"
 
-#: ../src/client/application/geary-controller.vala:1860
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -619,442 +615,186 @@ msgstr ""
 "Anexos podem causar danos ao seu sistema se abertos. Apenas abra arquivos de "
 "fontes confiáveis."
 
-#: ../src/client/application/geary-controller.vala:1861
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Não me _pergunte novamente"
 
-#: ../src/client/application/geary-controller.vala:1879
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Um arquivo chamado \"%s\" já existe. Você deseja substituí-lo?"
 
-#: ../src/client/application/geary-controller.vala:1881
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "O arquivo já existe em \"%s\". Substituí-lo irá sobrescrever o seu conteúdo."
 
-#: ../src/client/application/geary-controller.vala:1884
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Substituir"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2166
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Fechar mensagens de rascunhos abertas?"
 
-#: ../src/client/application/geary-controller.vala:2269
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Você deseja descartar permanentemente essa mensagem?"
 msgstr[1] "Você deseja descartar permanentemente essas mensagens?"
 
-#: ../src/client/application/geary-controller.vala:2271
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Excluir"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i ocorrência"
-msgstr[1] "%i ocorrências"
-
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i ocorrência (quebrada)"
-msgstr[1] "%i ocorrências (quebradas)"
-
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "não encontrado"
-
-#: ../src/client/components/main-toolbar.vala:11
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Pesquisar"
-
-#. Search bar.
-#: ../src/client/components/main-toolbar.vala:78
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Pesquisar todos os e-mails na conta por palavras-chave (Ctrl+S)"
-
-#: ../src/client/components/main-toolbar.vala:210
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indexando a conta %s"
-
-#: ../src/client/components/main-toolbar.vala:221
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Pesquisar conta %s"
-
-#: ../src/client/components/main-window.vala:347
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Enviando..."
-
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
-#: ../src/client/components/stock.vala:19 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Fechar"
-
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Descartar"
-
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Abrir"
-
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Imprimir..."
-
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Remover"
-
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1218
-msgid "Select _All"
-msgstr "Selecionar _tudo"
-
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Manter"
-
-#: ../src/client/composer/composer-widget.vala:58
-msgid "Saved"
-msgstr "Salvo"
-
-#: ../src/client/composer/composer-widget.vala:59
-msgid "Saving"
-msgstr "Salvando"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:60
-msgid "Error saving"
-msgstr "Erro ao salvar"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
+msgstr ""
 
-#. A 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:121
-msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
 msgstr ""
-"anexar|anexando|anexa|anexo|anexos|anexado|anexada|inserir|inserido|"
-"inserindo|insere|inserido|inserida|inseridos|inseridas"
 
-#: ../src/client/composer/composer-widget.vala:907
-msgid "Do you want to discard the unsaved message?"
-msgstr "Você deseja descartar a mensagem não salva?"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Iniciar Geary com a janela prinicipal oculta"
 
-#: ../src/client/composer/composer-widget.vala:910
-#: ../src/client/composer/composer-widget.vala:914
-msgid "Do you want to discard this message?"
-msgstr "Você deseja descartar "
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Informações de depuração de saída"
 
-#: ../src/client/composer/composer-widget.vala:1027
-msgid "Send message with an empty subject and body?"
-msgstr "Enviar mensagem com o assunto e corpo vazio?"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Gravar monitoramento de conversação"
 
-#: ../src/client/composer/composer-widget.vala:1029
-msgid "Send message with an empty subject?"
-msgstr "Enviar mensagem com o assunto vazio?"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Deserialização do log de rede"
 
-#: ../src/client/composer/composer-widget.vala:1031
-msgid "Send message with an empty body?"
-msgstr "Enviar mensagem com o corpo vazio?"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Registrar atividade de rede"
 
-#: ../src/client/composer/composer-widget.vala:1033
-msgid "Send message without an attachment?"
-msgstr "Enviar mensagem sem anexo?"
+#. / 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 "Gravar lista de repetição do IMAP"
 
-#: ../src/client/composer/composer-widget.vala:1216
-msgid "Cannot add attachment"
-msgstr "Não é possível adicionar anexo"
+#. / 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 "Registrar serialização de rede"
 
-#: ../src/client/composer/composer-widget.vala:1227
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "\"%s\" não foi encontrado."
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Registrar atividade periódica"
 
-#: ../src/client/composer/composer-widget.vala:1234
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" é uma pasta."
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Registrar consultas ao banco de dados (gera muitas mensagens)"
 
-#: ../src/client/composer/composer-widget.vala:1241
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" é um arquivo vazio."
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Registrar normalização de pasta"
 
-#: ../src/client/composer/composer-widget.vala:1255
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "\"%s\" não pôde ser aberto para leitura."
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Permitir inspeção do WebView"
 
-#: ../src/client/composer/composer-widget.vala:1262
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" já foi anexado para envio."
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Revogar todos os certificados de servidor com avisos de TLS"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1271
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Mostrar versão do programa"
 
-#: ../src/client/composer/composer-widget.vala:1331
-msgid "To: "
-msgstr "Para: "
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Usar %s para abrir uma nova janela de redator"
 
-#: ../src/client/composer/composer-widget.vala:1334
-msgid "Cc: "
-msgstr "Cc: "
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Por favor, envie sugestões, comentários ou bugs para:"
 
-#: ../src/client/composer/composer-widget.vala:1337
-msgid "Bcc: "
-msgstr "Cco: "
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Falha ao analisar as opções de linha de comando: %s\n"
 
-#: ../src/client/composer/composer-widget.vala:1340
-msgid "Reply-To: "
-msgstr "Responder-a:"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Opção de linha de comando não reconhecida \"%s\"\n"
 
-#: ../src/client/composer/composer-widget.vala:1573
-msgid "Select Color"
-msgstr "Selecione a cor"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Novas Mensagens"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2022
-msgid "_From:"
-msgstr "_De:"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d nova mensagem"
+msgstr[1] "%d novas mensagens"
 
-#. For other types of messages, just show the from account.
-#. Composer label (without mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2038
-#: ../src/client/conversation-viewer/conversation-viewer.vala:734
-msgid "From:"
-msgstr "De:"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d nova mensagem no total"
+msgstr[1] "%s, %d novas mensagens no total"
 
-#. Copyright 2011-2014 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Window for sending messages.
-#: ../src/client/composer/composer-window.vala:10
-msgid "New Message"
-msgstr "Nova mensagem"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d outra nova mensagem para %s)"
+msgstr[1] ""
+"%s\n"
+"(%d outras novas mensagens para %s)"
+
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Abrir"
 
 #: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Mim"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:338
-msgid "No conversations selected."
-msgstr "Não há conversas selecionadas."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:340
-#, c-format
-msgid "%u conversation selected."
-msgid_plural "%u conversations selected."
-msgstr[0] "%u conversa selecionada."
-msgstr[1] "%u conversas selecionadas."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:369
-msgid "No search results found."
-msgstr "Nenhum resultado encontrado"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:371
-msgid "No conversations in folder."
-msgstr "Não há conversas na pasta"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:633
-msgid "This message contains remote images."
-msgstr "Esta mensagem contém imagens remotas."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:633
-msgid "Show Images"
-msgstr "Mostrar imagens"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:634
-msgid "Always Show From Sender"
-msgstr "Mostrar sempre do remetente"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:658
-msgid "Edit Draft"
-msgstr "Editar rascunho"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:737
-msgid "To:"
-msgstr "Para:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:740
-msgid "Cc:"
-msgstr "Cc:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:743
-msgid "Bcc:"
-msgstr "Cco:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:746
-msgid "Subject:"
-msgstr "Assunto:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:749
-msgid "Date:"
-msgstr "Data:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1033
-#, c-format
-msgid "%u read message"
-msgid_plural "%u read messages"
-msgstr[0] "%u mensagem lida"
-msgstr[1] "%u mensagens lidas"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1165
-#, c-format
-msgid "This message was sent successfully, but could not be saved to %s."
-msgstr "Essa mensagem foi enviada com sucesso, mas não pôde ser salva para %s."
-
-#. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1191
-#: ../ui/composer.glade.h:4
-msgid "_Copy"
-msgstr "_Copiar"
-
-#. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1199
-msgid "Copy _Email Address"
-msgstr "Copiar endereço de _e-mail"
-
-#. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1204
-#: ../ui/composer.glade.h:17
-msgid "Copy _Link"
-msgstr "Copiar _Link"
-
-#. Select message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1212
-msgid "Select _Message"
-msgstr "Selecionar _Mensagem"
-
-#. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1224
-msgid "_Inspect"
-msgstr "_Inspecionar"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1450
-msgid "This link appears to go to"
-msgstr "Este link parece ir para"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1451
-msgid "but actually goes to"
-msgstr "mas atualmente vai para"
-
-#. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1506
-msgid " (Invalid?)"
-msgstr "(Inválido?)"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
-msgid "_Save Image As..."
-msgstr "_Salvar imagem como..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1716
-msgid "_Save As..."
-msgstr "_Salvar como"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1721
-msgid "Save All A_ttachments..."
-msgstr "Salvar todos os a_nexos..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1741
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "Salvar a_nexo..."
-msgstr[1] "Salvar todos os a_nexos..."
-
-#. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1756
-msgid "Reply to _All"
-msgstr "Responder a _todos"
-
-#. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1773
-msgid "_Mark as Read"
-msgstr "_Marcar como lida"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1777
-msgid "_Mark as Unread"
-msgstr "_Marcar como não lida"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1783
-msgid "Mark Unread From _Here"
-msgstr "Marcar como não lida a partir _daqui"
-
-#. Separator.
-#. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1798
-msgid "_View Source"
-msgstr "_Visualizar fonte"
-
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2122
-#: ../src/engine/rfc822/rfc822-utils.vala:331
-msgid "none"
-msgstr "nenhum"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2257
-msgid "Failed to open default text editor."
-msgstr "Falha ao abrir o editor de texto padrão."
-
-#: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - Inspetor de conversa"
-
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Escolha um arquivo"
-
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Anexo"
-
 #: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
 msgid "Untrusted Connection: %s"
 msgstr "Conexão não confiável: %s"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
 msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr ""
 "A identidade do servidor de e-mail %s em %s:%u não pôde ser verificado."
@@ -1128,85 +868,132 @@ msgstr "O certificado do servidor é considerado inseguro"
 msgid "An error has occurred processing the server's certificate"
 msgstr "Ocorreu um erro ao processar o certificado do servidor"
 
-#. 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 "Geary requires your email password to continue"
 msgstr "Geary requer sua senha de e-mail para continuar"
 
-#. 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 mensagem"
-msgstr[1] "%d mensagens"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Escolha um arquivo"
 
-#. / 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 não lida"
-msgstr[1] "%d não lidas"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Anexo"
 
-#. / 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/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr ""
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Caixas de entrada"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Contas"
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d resultado"
-msgstr[1] "%d resultados"
+#. / 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 "Primeiro Último"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Novas Mensagens"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Bem-vindo ao Geary"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d nova mensagem"
-msgstr[1] "%d novas mensagens"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Entre com as informações de sua conta para iniciar."
 
-#: ../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 nova mensagem no total"
-msgstr[1] "%s, %d novas mensagens no total"
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 semanas atrás"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 outra nova mensagem para %s)"
-msgstr[1] ""
-"%s\n"
-"(%d outras novas mensagens para %s)"
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 mês atrás"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Abrir"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 meses atrás"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 meses atrás"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 ano atrás"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "2 anos atrás"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "4 anos atrás"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Tudo"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "Lem_brar senhas"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "Lem_brar senha"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Incapaz de validar:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Apelido de conta inválido.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Endereço de e-mail já adicionado ao Geary.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Erro de conexão ao IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Nome de usuário ou senha de IMAP incorretos.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Erro de conexão ao SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; Nome de usuário ou senha SMTP incorretos.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Erro de conexão.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Nome de usuário ou senha incorretos.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Salvar"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Adicionar"
 
 #. / 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
@@ -1264,14 +1051,12 @@ msgid "Now"
 msgstr "Agora"
 
 #: ../src/client/util/util-date.vala:167
-#, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
 msgstr[0] "%dm atrás"
 msgstr[1] "%dm atrás"
 
 #: ../src/client/util/util-date.vala:171
-#, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
 msgstr[0] "%dh atrás"
@@ -1284,15 +1069,9 @@ msgstr "Ontem"
 #. / 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:30
-#: ../src/engine/rfc822/rfc822-message.vala:747
-msgid "(no subject)"
-msgstr "(sem assunto)"
-
 #: ../src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "bytes"
@@ -1317,687 +1096,756 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KB"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d mensagem"
+msgstr[1] "%d mensagens"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d não lida"
+msgstr[1] "%d não lidas"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Caixas de entrada"
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Pesquisar conta %s"
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Outro"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d resultado"
+msgstr[1] "%d resultados"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Caixa de entrada"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "Não há conversas selecionadas."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Rascunhos"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] "%u conversa selecionada."
+msgstr[1] "%u conversas selecionadas."
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "E-mails enviados"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
+msgstr "Nenhum resultado encontrado"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Com estrela"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
+msgstr "Não há conversas na pasta"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Importante"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
+msgstr "Esta mensagem contém imagens remotas."
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Todos os e-mails"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr "Mostrar imagens"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Spam"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
+msgstr "Mostrar sempre do remetente"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Lixeira"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
+msgstr "Editar rascunho"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Caixa de saída"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "De:"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Arquivar"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "Para:"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:25
-msgid "None"
-msgstr "Nenhum"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Cc:"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:665
-msgid "attachment"
-msgstr "anexo"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Cco:"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:669
-#: ../src/engine/imap-db/imap-db-account.vala:693
-msgid "bcc"
-msgstr "cco"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "Assunto:"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:673
-msgid "body"
-msgstr "corpo"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Data:"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:677
-#: ../src/engine/imap-db/imap-db-account.vala:693
-msgid "cc"
-msgstr "cc"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] "%u mensagem lida"
+msgstr[1] "%u mensagens lidas"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:681
-#: ../src/engine/imap-db/imap-db-account.vala:693
-msgid "from"
-msgstr "de"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
+msgstr ""
+"Essa mensagem foi enviada com sucesso, mas não pôde ser salva para %s."
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:685
-msgid "subject"
-msgstr "assunto"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "_Copiar"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:689
-#: ../src/engine/imap-db/imap-db-account.vala:693
-msgid "to"
-msgstr "para"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "Copiar endereço de _e-mail"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:709
-msgid "me"
-msgstr "eu"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "Copiar _Link"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:536
-msgid "Drafts | Draft"
-msgstr "Rascunhos | Rascunho"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
+msgstr "Selecionar _Mensagem"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:541
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "Enviados | Correios enviados | E-mails enviados"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Selecionar _tudo"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:546
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
-msgstr "Spam | Lixo eletrônico"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "_Inspecionar"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:551
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Lixeira | Lixo"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr "Este link parece ir para"
 
-#. / 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:168
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %b %-e, %Y em %-l:%M %p"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
+msgstr "mas atualmente vai para"
 
-#. / 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:174
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "Em %1$s, %2$s escreveu:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
+msgstr " (Inválido?)"
 
-#. / 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:181
-#, c-format
-msgid "%s wrote:"
-msgstr "%s escreveu:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
+msgstr "_Salvar imagem como..."
 
-#. / 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:187
-#, c-format
-msgid "On %s:"
-msgstr "Em %s:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_Salvar como"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:216
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Mensagem encaminhada ----------"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "Salvar todos os a_nexos..."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "From: %s\n"
-msgstr "De: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] "Salvar a_nexo..."
+msgstr[1] "Salvar todos os a_nexos..."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:221
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Assunto: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "Responder a _todos"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:222
-#, c-format
-msgid "Date: %s\n"
-msgstr "Data: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "_Marcar como lida"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:225
-#, c-format
-msgid "To: %s\n"
-msgstr "Para: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "_Marcar como não lida"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:228
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Cc: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
+msgstr "Marcar como não lida a partir _daqui"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "_Visualizar fonte"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "Falha ao abrir o editor de texto padrão."
+
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr "%s - Inspetor de conversa"
+
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Salvo"
+
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Salvando"
+
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Erro ao salvar"
+
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Não foi possível remover a conta</"
-"span> "
 
-#: ../ui/account_cannot_remove.glade.h:2
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Nova mensagem"
+
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Uma janela associada com esta conta está atualmente aberta. Envie ou "
-"descarte a mensagem e tente novamente."
+"anexar|anexando|anexa|anexo|anexos|anexado|anexada|inserir|inserido|inserindo"
+"|insere|inserido|inserida|inseridos|inseridas"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Adicionar conta"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Você deseja descartar"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Editar conta"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Enviar mensagem com o assunto e corpo vazio?"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Remover conta"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Enviar mensagem com o assunto vazio?"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Por favor, aguarde enquanto o Geary valida sua conta."
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Enviar mensagem com o corpo vazio?"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Conexão não confiável"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Enviar mensagem sem anexo?"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "_Sempre confiar nesse servidor"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Não é possível adicionar anexo"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "_Confiar nesse servidor"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "\"%s\" não foi encontrado."
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "_Não confiar nesse servidor"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" é uma pasta."
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Desfazer"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" é um arquivo vazio."
 
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Refazer"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "\"%s\" não pôde ser aberto para leitura."
 
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "Recor_tar"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "\"%s\" já foi anexado para envio."
 
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "_Colar"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Esquerda"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Para: "
 
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Direita"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Cc: "
 
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Centro"
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Cco: "
 
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Justificar"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "Responder-a: "
 
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Link (Ctrl+L)"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Selecione a cor"
 
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "C_or"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr ""
 
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Mais opções"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_De:"
 
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Texto citado (Ctrl+])"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Texto não-citado (Ctrl=[)"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Enviando..."
 
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Remover formatação (Ctrl+Space)"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i ocorrência"
+msgstr[1] "%i ocorrências"
 
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Colar _com formatação"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i ocorrência (quebrada)"
+msgstr[1] "%i ocorrências (quebradas)"
 
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Negrito (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Itálico (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Sublinhado (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Tachado (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "_Rich Text"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Mostras campos estendidos"
-
-#: ../ui/composer.glade.h:24
-msgid "Lar_ge"
-msgstr "_Grande"
-
-#: ../ui/composer.glade.h:25
-msgid "Large"
-msgstr "Grande"
-
-#: ../ui/composer.glade.h:26
-msgid "_Medium"
-msgstr "_Médio"
-
-#: ../ui/composer.glade.h:27
-msgid "Medium"
-msgstr "Médio"
-
-#: ../ui/composer.glade.h:28
-msgid "_Small"
-msgstr "_Pequeno"
-
-#: ../ui/composer.glade.h:29
-msgid "Small"
-msgstr "Pequeno"
-
-#: ../ui/composer.glade.h:30
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
-
-#: ../ui/composer.glade.h:31
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: ../ui/composer.glade.h:32
-msgid "S_erif"
-msgstr "S_erif"
-
-#: ../ui/composer.glade.h:33
-msgid "Serif"
-msgstr "Serif"
-
-#: ../ui/composer.glade.h:34
-msgid "_Fixed Width"
-msgstr "Largura _fixa"
-
-#: ../ui/composer.glade.h:35
-msgid "Fixed Width"
-msgstr "Largura fixa"
-
-#: ../ui/composer.glade.h:36
-msgid "Detach"
-msgstr "Desanexar"
-
-#: ../ui/composer.glade.h:37
-msgid "_Send"
-msgstr "_Enviar"
-
-#: ../ui/composer.glade.h:38
-msgid "Send"
-msgstr "Enviar"
-
-#: ../ui/composer.glade.h:39
-msgid "_Attach File"
-msgstr "_Anexar um arquivo"
-
-#: ../ui/composer.glade.h:40
-msgid "Attach File"
-msgstr "Anexar um arquivo"
-
-#: ../ui/composer.glade.h:41
-msgid "_Include Original Attachments"
-msgstr "_Inclui anexos originais"
-
-#: ../ui/composer.glade.h:42
-msgid "Include Original Attachments"
-msgstr "Inclui anexos originais"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "não encontrado"
 
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:44
-msgid "_To"
-msgstr "_Para"
-
-#: ../ui/composer.glade.h:45
-msgid "_Cc"
-msgstr "_Cc"
-
-#: ../ui/composer.glade.h:46
-msgid "_Subject"
-msgstr "A_ssunto"
-
-#: ../ui/composer.glade.h:47
-msgid "_Bcc"
-msgstr "Cc_o"
-
-#: ../ui/composer.glade.h:48
-msgid "_Reply-To"
-msgstr "_Responder-a"
-
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:50
-msgid "From"
-msgstr "De"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_OK"
 
-#: ../ui/composer.glade.h:51
-msgid "Drop files here"
-msgstr "Solte arquivos aqui"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: ../ui/composer.glade.h:52
-msgid "To add them as attachments"
-msgstr "Para adicionar eles como anexos"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Fechar"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Localizar:"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Descartar"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Anterior"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Abrir"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Próximo"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Imprimir..."
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Sensível à maiúsculas"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Remover"
+
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Manter"
+
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Pesquisar todos os e-mails na conta por palavras-chave (Ctrl+S)"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "rótulo"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Indexando a conta %s"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Senha"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "Endereço de e-_mail"
+#~ msgid "Geary Mail"
+#~ msgstr "Correio eletrônico - Geary"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Senha"
+#~ msgid "Send and receive email"
+#~ msgstr "Enviar e receber e-mail"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "S_erviço"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Email;E-mail;Mail;Correio eletrônico;e-mails;mensagens;"
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "N_ome"
+#~ msgid "Compose Message"
+#~ msgstr "Escrever mensagem"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "A_pelido"
+#~ msgid "Send by email"
+#~ msgstr "Enviar por e-mail"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Trabalho, Casa, etc."
+#~ msgid "Send files using Geary"
+#~ msgstr "Envia arquivos usando Geary"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_Salvar e-mails enviados"
+#~ msgid "Copyright 2011-2014 Yorba Foundation"
+#~ msgstr "Copyright 2011-2014 Yorba Foundation"
 
-#: ../ui/login.glade.h:10
-msgid "IMAP settings"
-msgstr "Configurações de IMAP"
+#~ msgid "_Delete"
+#~ msgstr "E_xcluir"
 
-#: ../ui/login.glade.h:11
-msgid "Se_rver"
-msgstr "Se_rvidor"
+#~ msgid "_Trash"
+#~ msgstr "Li_xeira"
 
-#: ../ui/login.glade.h:12
-msgid "P_ort"
-msgstr "P_orta"
+#~ msgid "Move conversation to trash (Delete, Backspace)"
+#~ msgstr "Mover conversa para a lixeira (Delete, Backspace)"
 
-#: ../ui/login.glade.h:13
-msgid "Ser_ver"
-msgstr "Ser_vidor"
+#~ msgid "Move conversations to trash (Delete, Backspace)"
+#~ msgstr "Mover conversas para a lixeira (Delete, Backspace)"
 
-#: ../ui/login.glade.h:14
-msgid "Por_t"
-msgstr "Por_ta"
+#~ msgid "_Donate"
+#~ msgstr "_Doação"
 
-#: ../ui/login.glade.h:15
-msgid "SMTP settings"
-msgstr "Configurações de SMTP"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Você deseja descartar a mensagem não salva?"
 
-#: ../ui/login.glade.h:16
-msgid "User_name"
-msgstr "Nome de _usuário"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Não foi possível remover a "
+#~ "conta</span> "
 
-#: ../ui/login.glade.h:17
-msgid "Pass_word"
-msgstr "Senh_a"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Uma janela associada com esta conta está atualmente aberta. Envie ou "
+#~ "descarte a mensagem e tente novamente."
 
-#: ../ui/login.glade.h:18
-msgid "SMTP username"
-msgstr "Usuário SMTP"
+#~ msgid "Add account"
+#~ msgstr "Adicionar conta"
 
-#: ../ui/login.glade.h:19
-msgid "SMTP password"
-msgstr "Senha SMTP"
+#~ msgid "Edit account"
+#~ msgstr "Editar conta"
 
-#: ../ui/login.glade.h:20
-msgid "_Username"
-msgstr "_Nome de usuário"
+#~ msgid "Remove account"
+#~ msgstr "Remover conta"
 
-#: ../ui/login.glade.h:21
-msgid "IMAP username"
-msgstr "Usuário IMAP"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Por favor, aguarde enquanto o Geary valida sua conta."
 
-#: ../ui/login.glade.h:22
-msgid "IMAP password"
-msgstr "Senha IMAP"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Conexão não confiável"
 
-#: ../ui/login.glade.h:23
-msgid "Encr_yption"
-msgstr "Encr_iptação"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "_Sempre confiar nesse servidor"
 
-#: ../ui/login.glade.h:24
-msgid "Encrypt_ion"
-msgstr "Encript_ação"
+#~ msgid "_Trust This Server"
+#~ msgstr "_Confiar nesse servidor"
 
-#: ../ui/login.glade.h:26
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "_Não confiar nesse servidor"
 
-#: ../ui/login.glade.h:27
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "_Undo"
+#~ msgstr "_Desfazer"
 
-#: ../ui/login.glade.h:28
-msgid "No authentication re_quired"
-msgstr "Nenhuma autenticação re_querida"
+#~ msgid "_Redo"
+#~ msgstr "_Refazer"
 
-#: ../ui/login.glade.h:29
-msgid "Use IMAP cre_dentials"
-msgstr "Usar cre_denciais de IMAP"
+#~ msgid "Cu_t"
+#~ msgstr "Recor_tar"
 
-#: ../ui/login.glade.h:30
-msgid "Storage"
-msgstr "Armazenamento"
+#~ msgid "_Paste"
+#~ msgstr "_Colar"
 
-#: ../ui/login.glade.h:31
-msgid "_Download mail"
-msgstr "Bai_xar e-mail:"
+#~ msgid "_Left"
+#~ msgstr "_Esquerda"
 
-#: ../ui/login.glade.h:32 ../ui/preferences.glade.h:4
-msgid "Composer"
-msgstr "Redator"
+#~ msgid "_Right"
+#~ msgstr "_Direita"
 
-#: ../ui/login.glade.h:33
-msgid "Save dra_fts on server"
-msgstr "Salvar rascun_ho no servidor"
+#~ msgid "_Center"
+#~ msgstr "_Centro"
 
-#: ../ui/login.glade.h:34
-msgid "Si_gn emails:"
-msgstr "Assi_nar e-mails:"
+#~ msgid "_Justify"
+#~ msgstr "_Justificar"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "Credenciais de SMTP"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Link (Ctrl+L)"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "Nome do usuário"
+#~ msgid "C_olor"
+#~ msgstr "C_or"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "Lemb_rar senha"
+#~ msgid "More options"
+#~ msgstr "Mais opções"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Autenticar"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Texto citado (Ctrl+])"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Lendo"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Texto não-citado (Ctrl=[)"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "Selecionar _automaticamente a próxima mensagem"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Remover formatação (Ctrl+Space)"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "_Exibir visualização de conversa"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Colar _com formatação"
 
-#: ../ui/preferences.glade.h:5
-msgid "Enable _spell checking"
-msgstr "Habilitar a _verificação ortográfica"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Negrito (Ctrl+B)"
 
-#: ../ui/preferences.glade.h:6
-msgid "Notifications"
-msgstr "Notificações"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Itálico (Ctrl+I)"
 
-#: ../ui/preferences.glade.h:7
-msgid "_Play notification sounds"
-msgstr "_Tocar sons de notificação"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Sublinhado (Ctrl+U)"
 
-#: ../ui/preferences.glade.h:8
-msgid "Show _notifications for new mail"
-msgstr "Exibir _notificações para novo e-mail"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Tachado (Ctrl+K)"
 
-#: ../ui/preferences.glade.h:9
-msgid "Notify of new mail at start_up"
-msgstr "Notificar sobre novo correio à _inicialização"
+#~ msgid "_Rich Text"
+#~ msgstr "_Rich Text"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Você tem certeza que quer remover esta "
-"conta?</span> "
+#~ msgid "Show Extended Fields"
+#~ msgstr "Mostras campos estendidos"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Todos os e-mails associados a esta conta serão removidos do seu computador. "
-"Isso não afetará os e-mails no servidor."
+#~ msgid "Lar_ge"
+#~ msgstr "_Grande"
+
+#~ msgid "Large"
+#~ msgstr "Grande"
+
+#~ msgid "_Medium"
+#~ msgstr "_Médio"
+
+#~ msgid "Medium"
+#~ msgstr "Médio"
+
+#~ msgid "_Small"
+#~ msgstr "_Pequeno"
+
+#~ msgid "Small"
+#~ msgstr "Pequeno"
+
+#~ msgid "S_ans Serif"
+#~ msgstr "S_ans Serif"
+
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
+
+#~ msgid "S_erif"
+#~ msgstr "S_erif"
+
+#~ msgid "Serif"
+#~ msgstr "Serif"
+
+#~ msgid "_Fixed Width"
+#~ msgstr "Largura _fixa"
+
+#~ msgid "Fixed Width"
+#~ msgstr "Largura fixa"
+
+#~ msgid "Detach"
+#~ msgstr "Desanexar"
+
+#~ msgid "_Send"
+#~ msgstr "_Enviar"
+
+#~ msgid "Send"
+#~ msgstr "Enviar"
+
+#~ msgid "_Attach File"
+#~ msgstr "_Anexar um arquivo"
+
+#~ msgid "Attach File"
+#~ msgstr "Anexar um arquivo"
+
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Inclui anexos originais"
+
+#~ msgid "Include Original Attachments"
+#~ msgstr "Inclui anexos originais"
+
+#~ msgid "_To"
+#~ msgstr "_Para"
+
+#~ msgid "_Cc"
+#~ msgstr "_Cc"
+
+#~ msgid "_Subject"
+#~ msgstr "A_ssunto"
+
+#~ msgid "_Bcc"
+#~ msgstr "Cc_o"
+
+#~ msgid "_Reply-To"
+#~ msgstr "_Responder-a"
+
+#~ msgid "From"
+#~ msgstr "De"
+
+#~ msgid "Drop files here"
+#~ msgstr "Solte arquivos aqui"
+
+#~ msgid "To add them as attachments"
+#~ msgstr "Para adicionar eles como anexos"
+
+#~ msgid "Find:"
+#~ msgstr "Localizar:"
+
+#~ msgid "_Previous"
+#~ msgstr "_Anterior"
+
+#~ msgid "_Next"
+#~ msgstr "_Próximo"
+
+#~ msgid "_Case sensitive"
+#~ msgstr "_Sensível à maiúsculas"
+
+#~ msgid "label"
+#~ msgstr "rótulo"
+
+#~ msgid "Password"
+#~ msgstr "Senha"
+
+#~ msgid "E_mail address"
+#~ msgstr "Endereço de e-_mail"
+
+#~ msgid "_Password"
+#~ msgstr "_Senha"
+
+#~ msgid "S_ervice"
+#~ msgstr "S_erviço"
+
+#~ msgid "N_ame"
+#~ msgstr "N_ome"
+
+#~ msgid "N_ickname"
+#~ msgstr "A_pelido"
+
+#~ msgid "Work, Home, etc."
+#~ msgstr "Trabalho, Casa, etc."
+
+#~ msgid "_Save sent mail"
+#~ msgstr "_Salvar e-mails enviados"
+
+#~ msgid "IMAP settings"
+#~ msgstr "Configurações de IMAP"
+
+#~ msgid "Se_rver"
+#~ msgstr "Se_rvidor"
+
+#~ msgid "P_ort"
+#~ msgstr "P_orta"
+
+#~ msgid "Ser_ver"
+#~ msgstr "Ser_vidor"
+
+#~ msgid "Por_t"
+#~ msgstr "Por_ta"
+
+#~ msgid "SMTP settings"
+#~ msgstr "Configurações de SMTP"
+
+#~ msgid "User_name"
+#~ msgstr "Nome de _usuário"
+
+#~ msgid "Pass_word"
+#~ msgstr "Senh_a"
+
+#~ msgid "SMTP username"
+#~ msgstr "Usuário SMTP"
+
+#~ msgid "SMTP password"
+#~ msgstr "Senha SMTP"
+
+#~ msgid "_Username"
+#~ msgstr "_Nome de usuário"
+
+#~ msgid "IMAP username"
+#~ msgstr "Usuário IMAP"
+
+#~ msgid "IMAP password"
+#~ msgstr "Senha IMAP"
+
+#~ msgid "Encr_yption"
+#~ msgstr "Encr_iptação"
+
+#~ msgid "Encrypt_ion"
+#~ msgstr "Encript_ação"
+
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
+
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
+
+#~ msgid "No authentication re_quired"
+#~ msgstr "Nenhuma autenticação re_querida"
+
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Usar cre_denciais de IMAP"
+
+#~ msgid "Storage"
+#~ msgstr "Armazenamento"
+
+#~ msgid "_Download mail"
+#~ msgstr "Bai_xar e-mail:"
+
+#~ msgid "Composer"
+#~ msgstr "Redator"
+
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Salvar rascun_ho no servidor"
+
+#~ msgid "Si_gn emails:"
+#~ msgstr "Assi_nar e-mails:"
+
+#~ msgid "SMTP Credentials"
+#~ msgstr "Credenciais de SMTP"
+
+#~ msgid "Username"
+#~ msgstr "Nome do usuário"
+
+#~ msgid "_Remember password"
+#~ msgstr "Lemb_rar senha"
+
+#~ msgid "_Authenticate"
+#~ msgstr "_Autenticar"
+
+#~ msgid "Reading"
+#~ msgstr "Lendo"
+
+#~ msgid "_Automatically select next message"
+#~ msgstr "Selecionar _automaticamente a próxima mensagem"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Exibir visualização de conversa"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Habilitar a _verificação ortográfica"
+
+#~ msgid "Notifications"
+#~ msgstr "Notificações"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Tocar sons de notificação"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Exibir _notificações para novo e-mail"
+
+#~ msgid "Notify of new mail at start_up"
+#~ msgstr "Notificar sobre novo correio à _inicialização"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Você tem certeza que quer remover esta "
+#~ "conta?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Todos os e-mails associados a esta conta serão removidos do seu computador. "
+#~ "Isso não afetará os e-mails no servidor."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Apelido:"
+#~ msgid "Nickname:"
+#~ msgstr "Apelido:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Endereço de e-mail:"
+#~ msgid "Email address:"
+#~ msgstr "Endereço de e-mail:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Atualização do Geary em progresso…"
+#~ msgid "Geary update in progress…"
+#~ msgstr "Atualização do Geary em progresso…"
 
 #~ msgid "Preferences"
 #~ msgstr "Preferências"
diff --git a/po/ro.po b/po/ro.po
index 83a2e57..90ecc0d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -10,417 +10,432 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=geary&";
-"keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-08-29 00:32+0000\n"
-"PO-Revision-Date: 2014-08-31 12:47+0200\n"
-"Last-Translator: Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:10+0000\n"
+"Last-Translator: Stas Solovey <whats_up tut by>\n"
 "Language-Team: Gnome Romanian Translation Team\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2);;\n"
-"X-Generator: Virtaal 0.7.1\n"
+"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
+"== 0) && (n != 0))) ? 2: 1));\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:55+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
 "X-Project-Style: gnome\n"
+"Language: ro\n"
 
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Client de email"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary Mail"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Trimite și primește emailuri"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Mail;Poștă;Electronică;"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Drafts | Draft | Ciorne | Ciornă"
 
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Compune un mesaj"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
+"Sent | Sent Mail | Sent Email | Sent E-Mail | Trimise | Emailuri Trimise"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Salvează"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+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 | Mesaje nedorite"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Adaugă"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Trash | Rubbish | Rubbish Bin | Gunoi | Coșul de guni"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:19
-msgid "Accounts"
-msgstr "Conturi"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#. Copyright 2011-2014 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Prenume Nume"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Mesaje primite"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-msgid "Welcome to Geary."
-msgstr "Bine ați venit la Geary."
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Ciorne"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-msgid "Enter your account information to get started."
-msgstr "Introduceți detaliile contului pentru a începe."
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Mesaje trimise"
 
-#: ../src/client/accounts/add-edit-page.vala:247
-msgid "2 weeks back"
-msgstr "acum 2 săptămâni"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Cu stea"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:248
-msgid "1 month back"
-msgstr "acum o lună"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Importante"
 
-#: ../src/client/accounts/add-edit-page.vala:249
-msgid "3 months back"
-msgstr "acum 3 luni"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Toate mesajele"
 
-#: ../src/client/accounts/add-edit-page.vala:250
-msgid "6 months back"
-msgstr "acum 6 luni"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Spam"
 
-#: ../src/client/accounts/add-edit-page.vala:251
-msgid "1 year back"
-msgstr "acum 1 an"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Gunoi"
 
-#: ../src/client/accounts/add-edit-page.vala:252
-msgid "2 years back"
-msgstr "acum 2 ani"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Mesaje în curs de trimitere"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "4 years back"
-msgstr "acum 4 ani"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Caută"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "Everything"
-msgstr "Totul"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Arhivă"
 
-#: ../src/client/accounts/add-edit-page.vala:686
-msgid "Remem_ber passwords"
-msgstr "_Memorează parolele"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Nici una"
 
-#: ../src/client/accounts/add-edit-page.vala:693 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "_Memorează parola"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:727
-msgid "Unable to validate:\n"
-msgstr "Nu s-a putut valida:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:729
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Pseudonimul nu este valid.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:732
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; Adresa de email este deja adăugată în Geary.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:736
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; Eroare la conexiunea IMAP.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:739
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; Nume utilizator sau parolă IMAP incorecte.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Altele"
 
-#: ../src/client/accounts/add-edit-page.vala:742
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; Eroare la conexiunea SMTP.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "atașament"
 
-#: ../src/client/accounts/add-edit-page.vala:745
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; Numele de utilizator sau parola SMTP sunt incorecte.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "bcc"
 
-#: ../src/client/accounts/add-edit-page.vala:749
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Eroare de conexiune.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "conținut"
 
-#: ../src/client/accounts/add-edit-page.vala:753
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Numele de utilizator sau parola sunt incorecte.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "cc"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2014 Yorba Foundation"
-msgstr "Drepturi de autor 2011-2014 Fundația Yorba"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "de la"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Vizitează situl Yorba"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "subiect"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Pornește Geary cu fereastra principală ascunsă"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "la"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Afișează informații de depanare"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "mine"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Înregistrează monitorizarea conversațiilor"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(fără titlu)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Înregistrează deserializarea rețelei"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %-e %b %Y la %-l:%M %p"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Îregistrează activitatea rețelei"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "La %1$s, %2$s a scris:"
 
-#. / 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 "Înregistrează coada de evenimente IMAP"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s a scris:"
 
-#. / 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 "Înregistrează serializarea rețelei"
+#. / 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:234
+msgid "On %s:"
+msgstr "La %s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Înregistrează activitatea periodică"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Mesaj înaintat ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Înregistrează interogările bazei de date (generează multe mesajee)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "De la: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Înregistrează normalizarea directorului"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Subiect: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Permite inspecția WebView-ului"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Data: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Revocă toate certificatele serverelor cu avertizări TLS"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Către: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Afișează versiunea programului"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Cc: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Utilizați %s pentru a deschide o nouă fereastră de compunere"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "fără"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Raportați comentarii, sugestii și defecte la:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Client de email"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Eroare la parsarea opțiunilor din linia de comandă: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Opțiune de linie de comandă nerecunoscută \"%s\"\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Vizitează situl Yorba"
 
-#: ../src/client/application/geary-controller.vala:56
-msgid "_Delete"
-msgstr "Ș_terge"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Șterge conversația (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Șterge conversațiile (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:62
-msgid "_Trash"
-msgstr "Mu_tă la gunoi"
-
-#: ../src/client/application/geary-controller.vala:63
-msgid "Move conversation to trash (Delete, Backspace)"
-msgstr "Mută conversația la Gunoi (Delete, Backspace)"
-
-#: ../src/client/application/geary-controller.vala:64
-msgid "Move conversations to trash (Delete, Backspace)"
-msgstr "Mută conversațiile la gunoi (Delete, Backspace)"
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr ""
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
 #: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Arhivează"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Arhivează conversația (A)"
 
-#: ../src/client/application/geary-controller.vala:70
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Arhivează conversațiile (A)"
 
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Marchează ca s_pam"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Marchează ca non-s_pam"
 
-#: ../src/client/application/geary-controller.vala:76
-#: ../src/client/application/geary-controller.vala:295
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Marchează conversația"
 
-#: ../src/client/application/geary-controller.vala:77
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Marchează conversațiile"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Adaugă etichetă conversației"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Adaugă etichetă conversațiilor"
 
-#: ../src/client/application/geary-controller.vala:80
-#: ../src/client/application/geary-controller.vala:334
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Mută conversația"
 
-#: ../src/client/application/geary-controller.vala:81
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Mută conversațiile"
 
-#: ../src/client/application/geary-controller.vala:271
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "_Conturi"
 
-#: ../src/client/application/geary-controller.vala:276
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Preferințe"
 
-#: ../src/client/application/geary-controller.vala:280
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Ajutor"
 
-#: ../src/client/application/geary-controller.vala:284
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Despre"
 
-#: ../src/client/application/geary-controller.vala:288
-msgid "_Donate"
-msgstr "_Donează"
-
-#: ../src/client/application/geary-controller.vala:292
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Ieșire"
 
-#: ../src/client/application/geary-controller.vala:297
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Marchează ca..."
 
-#: ../src/client/application/geary-controller.vala:303
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Ma_rchează ca citit"
 
-#: ../src/client/application/geary-controller.vala:309
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Marchează ca _necitit"
 
-#: ../src/client/application/geary-controller.vala:315
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "Marchează cu o _stea"
 
-#: ../src/client/application/geary-controller.vala:320
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "Eliminați _steaua"
 
-#: ../src/client/application/geary-controller.vala:330
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Adaugă etichetă"
 
-#: ../src/client/application/geary-controller.vala:331
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Etichetă"
 
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Mută"
 
-#: ../src/client/application/geary-controller.vala:339
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Compune un mesaj nou (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:343
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1579
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Răspunde"
 
-#: ../src/client/application/geary-controller.vala:344
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Răspunde (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:348
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "Răspund_e tuturor"
 
-#: ../src/client/application/geary-controller.vala:349
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Răspunde tuturor (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:354
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1589
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "Î_naintează"
 
-#: ../src/client/application/geary-controller.vala:355
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Înaintează (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:623
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Nu s-a putut stoca excepția la servere de încredere"
 
-#: ../src/client/application/geary-controller.vala:860
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Configurările tale sunt nesigure"
 
-#: ../src/client/application/geary-controller.vala:861
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -430,17 +445,17 @@ msgstr ""
 "unei alte persoane de pe rețea să îți citească utilizatorul și parola. "
 "Sunteți sigur că vreți să faceți asta?"
 
-#: ../src/client/application/geary-controller.vala:862
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "Co_ntinuă"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:940
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Eroare la trimiterea emailului"
 
-#: ../src/client/application/geary-controller.vala:941
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -448,14 +463,12 @@ msgstr ""
 "Geary a întâmpinat o eroare la trimiterea unui email. Dacă problema "
 "persistă, ștergeți manual emailul din directorul Outbox."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:945
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Eroare la salvarea emailului trimis"
 
-#: ../src/client/application/geary-controller.vala:946
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -463,20 +476,15 @@ msgstr ""
 "Geary a întâmpinat o eroare la salvarea unui mesaj trimis în dosarul „Mesaje "
 "trimise”. Mesajul va rămâne în dosarul Outbox până îl veți șterge."
 
-#: ../src/client/application/geary-controller.vala:1015
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Etichete"
 
-#. 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:1027
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Nu s-a reușit deschiderea bazei de date pentru %s"
 
-#: ../src/client/application/geary-controller.vala:1028
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -500,21 +508,19 @@ msgstr ""
 "Reconstrucția bazei de date va șterge toate emailurile locale și fișierele "
 "lor atașate. <b>Emailurile de pe server nu vor fi afectate.</b>"
 
-#: ../src/client/application/geary-controller.vala:1030
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "_Reconstruiește"
 
-#: ../src/client/application/geary-controller.vala:1030
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "_Ieșire"
 
-#: ../src/client/application/geary-controller.vala:1039
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Nu s-a reușit reconstrucția bazei de date pentru „%s”"
 
-#: ../src/client/application/geary-controller.vala:1040
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -524,17 +530,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1062
-#: ../src/client/application/geary-controller.vala:1072
-#: ../src/client/application/geary-controller.vala:1083
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Nu s-a reușit deschiderea cutiei poștale locale pentru %s"
 
-#: ../src/client/application/geary-controller.vala:1063
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -552,7 +554,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1073
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -566,7 +568,7 @@ msgstr ""
 "\n"
 "Instalați ultima versiune de Geary și încercați din nou."
 
-#: ../src/client/application/geary-controller.vala:1084
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -578,27 +580,32 @@ msgstr ""
 "\n"
 "Te rog verifică-ți conexiunea la internet și repornește Geary."
 
-#: ../src/client/application/geary-controller.vala:1591
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "Despre %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1594
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
 msgstr ""
 "CoolGoose <melipse AT gmail DOT com>\n"
 "Corneliu Dascălu <corneliu DOT dascalu AT gmail DOT com>\n"
 "Viorel-Cătălin Răpițeanu <rapiteanu DOT catalin AT gmail DOT com>\n"
-"Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>"
+"Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Stas Solovey https://launchpad.net/~whats-up";
 
-#: ../src/client/application/geary-controller.vala:1858
-#, c-format
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Sigur doriți să deschideți „%s”?"
 
-#: ../src/client/application/geary-controller.vala:1859
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -606,444 +613,195 @@ msgstr ""
 "Atașamentele pot cauza probleme sistemului dumneavoastră dacă sunt deschise. "
 "Deschideți doar atașamentele din surse sigure."
 
-#: ../src/client/application/geary-controller.vala:1860
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Nu întreb_a din nou"
 
-#: ../src/client/application/geary-controller.vala:1878
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Un fișier numit „%s” există deja. Doriți să-l înlocuiți?"
 
-#: ../src/client/application/geary-controller.vala:1880
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr "Fișierul deja există în „%s”.  Înlocuirea va suprascrie conținutul lui."
+msgstr ""
+"Fișierul deja există în „%s”.  Înlocuirea va suprascrie conținutul lui."
 
-#: ../src/client/application/geary-controller.vala:1883
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "Î_nlocuiește"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2150
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Închideți mesajele de tip ciornă deschise?"
 
-#: ../src/client/application/geary-controller.vala:2259
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Doriți să ștergeți permanent acest mesaj?"
 msgstr[1] "Doriți să ștergeți permanent aceste mesaje?"
 msgstr[2] "Doriți să ștergeți permanent aceste mesaje?"
 
-#: ../src/client/application/geary-controller.vala:2261
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Șterge"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i potrivire"
-msgstr[1] "%i potriviri"
-msgstr[2] "%i de potriviri"
-
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i potriviri (wrapped)"
-msgstr[1] "%i potriviri (wrapped)"
-msgstr[2] "%i potriviri (wrapped)"
-
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "nu a fost găsit"
-
-#: ../src/client/components/main-toolbar.vala:11
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Caută"
-
-#. Search bar.
-#: ../src/client/components/main-toolbar.vala:78
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Caută cuvintele cheie în toate emailurile din cont (Ctrl+S)"
-
-#: ../src/client/components/main-toolbar.vala:212
-#, c-format
-msgid "Indexing %s account"
-msgstr "Se indexează contul %s"
-
-#: ../src/client/components/main-toolbar.vala:223
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Caută în contul %s"
-
-#: ../src/client/components/main-window.vala:323
-#, c-format
-#| msgid "%s (%s)"
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Se trimite..."
-
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_OK"
-
-#: ../src/client/components/stock.vala:19 ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Anulează"
-
-#: ../src/client/components/stock.vala:23 ../ui/account_list.glade.h:4
-#: ../ui/preferences.glade.h:2
-msgid "_Close"
-msgstr "În_chide"
-
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Renunță"
-
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Deschide"
-
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "Ti_părește..."
-
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Șterge"
-
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1047
-msgid "Select _All"
-msgstr "Selectează t_ot"
-
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Păstrează"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:57
-msgid "Saved"
-msgstr "Salvat"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:58
-msgid "Saving"
-msgstr "Se salvează"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:59
-msgid "Error saving"
-msgstr "Salvare eșuată"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Pornește Geary cu fereastra principală ascunsă"
 
-#. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
-#: ../src/client/composer/composer-widget.vala:106
-msgid "attach|enclosed|enclosing|cover letter"
-msgstr "atașament|încadrat|atașat|atașând|anexănd|anexă"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Afișează informații de depanare"
 
-#: ../src/client/composer/composer-widget.vala:823
-msgid "Do you want to discard the unsaved message?"
-msgstr "Renunțați la acest mesaj nesalvat?"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Înregistrează monitorizarea conversațiilor"
 
-#: ../src/client/composer/composer-widget.vala:826
-#: ../src/client/composer/composer-widget.vala:830
-msgid "Do you want to discard this message?"
-msgstr "Renunțați la acest mesaj?"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Înregistrează deserializarea rețelei"
 
-#: ../src/client/composer/composer-widget.vala:911
-msgid "Send message with an empty subject and body?"
-msgstr "Trimiteți mesajul fără subiect și conținut?"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Îregistrează activitatea rețelei"
 
-#: ../src/client/composer/composer-widget.vala:913
-msgid "Send message with an empty subject?"
-msgstr "Trimiteți mesajul fără subiect?"
+#. / 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 "Înregistrează coada de evenimente IMAP"
 
-#: ../src/client/composer/composer-widget.vala:915
-msgid "Send message with an empty body?"
-msgstr "Trimiteți mesajul fără conținut?"
+#. / 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 "Înregistrează serializarea rețelei"
 
-#: ../src/client/composer/composer-widget.vala:917
-msgid "Send message without an attachment?"
-msgstr "Trimiteți mesajul fără niciun fișier atașat?"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Înregistrează activitatea periodică"
 
-#: ../src/client/composer/composer-widget.vala:1100
-msgid "Cannot add attachment"
-msgstr "Nu se poate atașa fișierul"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Înregistrează interogările bazei de date (generează multe mesajee)"
 
-#: ../src/client/composer/composer-widget.vala:1111
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "„%s” nu a putut fi găsit."
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Înregistrează normalizarea directorului"
 
-#: ../src/client/composer/composer-widget.vala:1118
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "„%s” este un dosar."
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Permite inspecția WebView-ului"
 
-#: ../src/client/composer/composer-widget.vala:1125
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "„%s” este un fișier gol."
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Revocă toate certificatele serverelor cu avertizări TLS"
 
-#: ../src/client/composer/composer-widget.vala:1139
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "„%s” nu a putut fi deschis pentru citire."
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Afișează versiunea programului"
 
-#: ../src/client/composer/composer-widget.vala:1146
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "„%s” este deja atașat pentru trimitere."
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Utilizați %s pentru a deschide o nouă fereastră de compunere"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1155
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Raportați comentarii, sugestii și defecte la:"
 
-#: ../src/client/composer/composer-widget.vala:1215
-#| msgid "To: %s\n"
-msgid "To: "
-msgstr "Către: "
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Eroare la parsarea opțiunilor din linia de comandă: %s\n"
 
-#: ../src/client/composer/composer-widget.vala:1218
-#| msgid "Cc: %s\n"
-msgid "Cc: "
-msgstr "Cc: "
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Opțiune de linie de comandă nerecunoscută \"%s\"\n"
 
-#: ../src/client/composer/composer-widget.vala:1221
-#| msgid "Bcc:"
-msgid "Bcc: "
-msgstr "Bcc: "
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Mesaje noi"
 
-#: ../src/client/composer/composer-widget.vala:1438
-msgid "Select Color"
-msgstr "Selectează culoarea"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d mesaj nou"
+msgstr[1] "%d mesaje noi"
+msgstr[2] "%d de mesaje noi"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:1884
-msgid "_From:"
-msgstr "_De la:"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d mesaj nou în total"
+msgstr[1] "%s, %d mesaje noi în total"
+msgstr[2] "%s, %d de mesaje noi în total"
 
-#. For other types of messages, just show the from account.
-#. Composer label (without mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:1900
-#: ../src/client/conversation-viewer/conversation-viewer.vala:637
-msgid "From:"
-msgstr "De la:"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d mesaje nou pentru %s)"
+msgstr[1] ""
+"%s\n"
+"(%d alte mesaje noi pentru %s)"
+msgstr[2] ""
+"%s\n"
+"(%d alte mesaje noi pentru %s)"
 
-#. Copyright 2011-2014 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Window for sending messages.
-#: ../src/client/composer/composer-window.vala:10
-msgid "New Message"
-msgstr "Mesaj nou"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Deschide"
 
 #: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Eu"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:262
-msgid "No conversations selected."
-msgstr "Nici o conversație selectată."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:264
-#, c-format
-msgid "%u conversation selected."
-msgid_plural "%u conversations selected."
-msgstr[0] "%u discuție selectată."
-msgstr[1] "%u discuții selectate."
-msgstr[2] "%u de discuții selectate."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:293
-msgid "No search results found."
-msgstr "Nici un rezultat la căutare."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:295
-msgid "No conversations in folder."
-msgstr "Nici o conversație în dosar."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:536
-msgid "This message contains remote images."
-msgstr "Acest mesaj conține imagini de pe un alt server."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:536
-msgid "Show Images"
-msgstr "Arată imagini"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:537
-msgid "Always Show From Sender"
-msgstr "Afișează întotdeauna de la acest expeditor"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:561
-msgid "Edit Draft"
-msgstr "Editează ciorna"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:640
-msgid "To:"
-msgstr "Către:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:643
-msgid "Cc:"
-msgstr "Cc:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:646
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:649
-msgid "Subject:"
-msgstr "Subiect:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:652
-msgid "Date:"
-msgstr "Data:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:862
-#, c-format
-msgid "%u read message"
-msgid_plural "%u read messages"
-msgstr[0] "%u mesaj citit"
-msgstr[1] "%u mesaje citite"
-msgstr[2] "%u de mesaje citite"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:994
-#, c-format
-msgid "This message was sent successfully, but could not be saved to %s."
-msgstr "Acest mesaj a fost trimis cu succes, dar nu a putut fi salvat în %s."
-
-#. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1020
-#: ../ui/composer.glade.h:4
-msgid "_Copy"
-msgstr "_Copiază"
-
-#. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1028
-msgid "Copy _Email Address"
-msgstr "Copiază adresa de _email"
-
-#. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1033
-#: ../ui/composer.glade.h:17
-msgid "Copy _Link"
-msgstr "Copiază _legătura"
-
-#. Select message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1041
-msgid "Select _Message"
-msgstr "Selectează _mesajul"
-
-#. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1053
-msgid "_Inspect"
-msgstr "_Inspectează"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1279
-msgid "This link appears to go to"
-msgstr "Acestă legătură pare să indice spre"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1280
-msgid "but actually goes to"
-msgstr "dar de fapt trimite la"
-
-#. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1335
-msgid " (Invalid?)"
-msgstr " (Nevalid?)"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1527
-msgid "_Save As..."
-msgstr "_Salvează ca..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1532
-msgid "Save All A_ttachments..."
-msgstr "Salvează toate fișierele a_tașate..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1546
-msgid "_Save Image As..."
-msgstr "_Salvează imaginea ca..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1569
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "Salvează fișierul a_tașat..."
-msgstr[1] "Salvează toate fișierele a_tașate..."
-msgstr[2] "Salvează toate fișierele a_tașate..."
-
-#. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1584
-msgid "Reply to _All"
-msgstr "Răspunde _tuturor"
-
-#. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1601
-msgid "_Mark as Read"
-msgstr "_Marchează ca citit"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1605
-msgid "_Mark as Unread"
-msgstr "_Marchează ca necitit"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1611
-msgid "Mark Unread From _Here"
-msgstr "Marc_hează ca necitit de aici"
-
-#. Separator.
-#. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1626
-msgid "_View Source"
-msgstr "_Vezi sursa"
-
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1940
-#: ../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "fără"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2070
-msgid "Failed to open default text editor."
-msgstr "Eroare la deschiderea editorului de text implicit."
-
-#: ../src/client/conversation-viewer/conversation-web-view.vala:321
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - Inspector conversație"
-
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Alegeți un fișier"
-
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Atașează"
-
 #: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
 msgid "Untrusted Connection: %s"
 msgstr "Conexiune fără încredere: %s"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
 msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr "Identitatea serverului de mail %s de la %s:%u nu a putut fi verificată."
+msgstr ""
+"Identitatea serverului de mail %s de la %s:%u nu a putut fi verificată."
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:44
 msgid ""
@@ -1051,8 +809,7 @@ msgid ""
 "your username and password to be transmitted insecurely."
 msgstr ""
 "Selectând „Mă încred în acest server” sau „Mă încred întotdeauna în acest "
-"server” poate cauza ca utilizatorul și parola să fie trasmise în mod "
-"nesigur."
+"server” poate cauza ca utilizatorul și parola să fie trasmise în mod nesigur."
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:52
 msgid ""
@@ -1092,7 +849,8 @@ msgstr "Certificatul serverului nu este semnat de o autoritate cunoscută"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:76
 msgid "The server's identity does not match the identity in the certificate"
-msgstr "Identitatea serveruluin nu se potrivește cu identitatea certificatului"
+msgstr ""
+"Identitatea serveruluin nu se potrivește cu identitatea certificatului"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:79
 msgid "The server's certificate has expired"
@@ -1114,93 +872,133 @@ msgstr "Certificatul serverului este considerat nesigur"
 msgid "An error has occurred processing the server's certificate"
 msgstr "S-a produs o eroare la procesarea certificatului serverului"
 
-#. 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 password"
-msgstr "Introduceți parola"
+msgid "Geary requires your email password to continue"
+msgstr ""
 
-#. 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 mesaj"
-msgstr[1] "%d mesaje"
-msgstr[2] "%d de mesaje"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Alegeți un fișier"
 
-#. / 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 necitit"
-msgstr[1] "%d necitite"
-msgstr[2] "%d necitite"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Atașează"
 
-#. / 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/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr ""
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Toate mesajele primite"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Conturi"
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d rezultat"
-msgstr[1] "%d rezultate"
-msgstr[2] "%d de rezultate"
+#. / 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 "Prenume Nume"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Mesaje noi"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Bine ați venit la Geary."
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d mesaj nou"
-msgstr[1] "%d mesaje noi"
-msgstr[2] "%d de mesaje noi"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Introduceți detaliile contului pentru a începe."
 
-#: ../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 mesaj nou în total"
-msgstr[1] "%s, %d mesaje noi în total"
-msgstr[2] "%s, %d de mesaje noi în total"
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "acum 2 săptămâni"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 mesaje nou pentru %s)"
-msgstr[1] ""
-"%s\n"
-"(%d alte mesaje noi pentru %s)"
-msgstr[2] ""
-"%s\n"
-"(%d alte mesaje noi pentru %s)"
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "acum o lună"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Deschide"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "acum 3 luni"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "acum 6 luni"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "acum 1 an"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "acum 2 ani"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "acum 4 ani"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Totul"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "_Memorează parolele"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "_Memorează parola"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Nu s-a putut valida:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Pseudonimul nu este valid.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Adresa de email este deja adăugată în Geary.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Eroare la conexiunea IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Nume utilizator sau parolă IMAP incorecte.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Eroare la conexiunea SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr ""
+"        &#8226; Numele de utilizator sau parola SMTP sunt incorecte.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Eroare de conexiune.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Numele de utilizator sau parola sunt incorecte.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Salvează"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Adaugă"
 
 #. / 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
@@ -1258,7 +1056,6 @@ msgid "Now"
 msgstr "Acum"
 
 #: ../src/client/util/util-date.vala:167
-#, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
 msgstr[0] "acum %dm"
@@ -1266,7 +1063,6 @@ msgstr[1] "acum %dm"
 msgstr[2] "acum %dm"
 
 #: ../src/client/util/util-date.vala:171
-#, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
 msgstr[0] "acum %dh"
@@ -1280,15 +1076,9 @@ msgstr "Ieri"
 #. / 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:30
-#: ../src/engine/rfc822/rfc822-message.vala:741
-msgid "(no subject)"
-msgstr "(fără titlu)"
-
 #: ../src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "octeți"
@@ -1313,698 +1103,783 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KO"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d mesaj"
+msgstr[1] "%d mesaje"
+msgstr[2] "%d de mesaje"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d necitit"
+msgstr[1] "%d necitite"
+msgstr[2] "%d necitite"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Toate mesajele primite"
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Caută în contul %s"
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Altele"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d rezultat"
+msgstr[1] "%d rezultate"
+msgstr[2] "%d de rezultate"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Mesaje primite"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "Nici o conversație selectată."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Ciorne"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] "%u discuție selectată."
+msgstr[1] "%u discuții selectate."
+msgstr[2] "%u de discuții selectate."
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Mesaje trimise"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
+msgstr "Nici un rezultat la căutare."
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Cu stea"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
+msgstr "Nici o conversație în dosar."
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Importante"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
+msgstr "Acest mesaj conține imagini de pe un alt server."
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Toate mesajele"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr "Arată imagini"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Spam"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
+msgstr "Afișează întotdeauna de la acest expeditor"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Gunoi"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
+msgstr "Editează ciorna"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Mesaje în curs de trimitere"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "De la:"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Arhivă"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "Către:"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:25
-msgid "None"
-msgstr "Nici una"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Cc:"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.
-#: ../src/engine/imap-db/imap-db-account.vala:662
-msgid "attachment"
-msgstr "atașament"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Bcc:"
 
-#. / Can be typed in the search box like bcc:johndoe example com to find
-#. / messages bcc'd to a particular person.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:665
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "bcc"
-msgstr "bcc"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "Subiect:"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:668
-msgid "body"
-msgstr "conținut"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Data:"
 
-#. / Can be typed in the search box like cc:johndoe example com to find
-#. / messages cc'd to a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:671
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "cc"
-msgstr "cc"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] "%u mesaj citit"
+msgstr[1] "%u mesaje citite"
+msgstr[2] "%u de mesaje citite"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.
-#: ../src/engine/imap-db/imap-db-account.vala:674
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "from"
-msgstr "de la"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
+msgstr "Acest mesaj a fost trimis cu succes, dar nu a putut fi salvat în %s."
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:677
-msgid "subject"
-msgstr "subiect"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "_Copiază"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:680
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "to"
-msgstr "la"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "Copiază adresa de _email"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.
-#: ../src/engine/imap-db/imap-db-account.vala:699
-msgid "me"
-msgstr "mine"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "Copiază _legătura"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:535
-msgid "Drafts | Draft"
-msgstr "Drafts | Draft | Ciorne | Ciornă"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
+msgstr "Selectează _mesajul"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:540
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Selectează t_ot"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "_Inspectează"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr "Acestă legătură pare să indice spre"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
+msgstr "dar de fapt trimite la"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
+msgstr " (Nevalid?)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
+msgstr "_Salvează imaginea ca..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_Salvează ca..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "Salvează toate fișierele a_tașate..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] "Salvează fișierul a_tașat..."
+msgstr[1] "Salvează toate fișierele a_tașate..."
+msgstr[2] "Salvează toate fișierele a_tașate..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "Răspunde _tuturor"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "_Marchează ca citit"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "_Marchează ca necitit"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
+msgstr "Marc_hează ca necitit de aici"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "_Vezi sursa"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "Eroare la deschiderea editorului de text implicit."
+
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr "%s - Inspector conversație"
+
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Salvat"
+
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Se salvează"
+
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Salvare eșuată"
+
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
 msgstr ""
-"Sent | Sent Mail | Sent Email | Sent E-Mail | Trimise | Emailuri Trimise"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:545
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Mesaj nou"
+
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail | Mesaje nedorite"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:550
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Trash | Rubbish | Rubbish Bin | Gunoi | Coșul de guni"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Renunțați la acest mesaj?"
 
-#. / 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 la %-l:%M %p"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Trimiteți mesajul fără subiect și conținut?"
 
-#. / 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 "La %1$s, %2$s a scris:"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Trimiteți mesajul fără subiect?"
 
-#. / 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 a scris:"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Trimiteți mesajul fără conținut?"
 
-#. / 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 "La %s:"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Trimiteți mesajul fără niciun fișier atașat?"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Mesaj înaintat ----------"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Nu se poate atașa fișierul"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "De la: %s\n"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "„%s” nu a putut fi găsit."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Subiect: %s\n"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "„%s” este un dosar."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "Data: %s\n"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "„%s” este un fișier gol."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "Către: %s\n"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "„%s” nu a putut fi deschis pentru citire."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Cc: %s\n"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "„%s” este deja atașat pentru trimitere."
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">Contul nu poate fi eliminat</span> "
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/composer/composer-widget.vala:1645
+#| msgid "To: %s\n"
+msgid "To: "
+msgstr "Către: "
+
+#: ../src/client/composer/composer-widget.vala:1648
+#| msgid "Cc: %s\n"
+msgid "Cc: "
+msgstr "Cc: "
+
+#: ../src/client/composer/composer-widget.vala:1651
+#| msgid "Bcc:"
+msgid "Bcc: "
+msgstr "Bcc: "
+
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
 msgstr ""
-"O fereastră de compunere asociată cu acest cont este deschisă. Trimiteți sau "
-"anulați mesajul și încearcați din nou."
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Adaugă cont"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Selectează culoarea"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Editează cont"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr ""
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Șterge cont"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_De la:"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Așteptați cât timp Geary vă validează contul."
+#: ../src/client/components/main-window.vala:388
+#| msgid "%s (%s)"
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Se trimite..."
+
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i potrivire"
+msgstr[1] "%i potriviri"
+msgstr[2] "%i de potriviri"
+
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i potriviri (wrapped)"
+msgstr[1] "%i potriviri (wrapped)"
+msgstr[2] "%i potriviri (wrapped)"
+
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "nu a fost găsit"
+
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_OK"
+
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Anulează"
+
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "În_chide"
+
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Renunță"
+
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Deschide"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Conexiune fără încredere"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "Ti_părește..."
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "Mă încred întotdeauna în _acest server"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Șterge"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "Mă încred în acest se_rver"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Păstrează"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "Nu mă încre_d în acest server"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Caută cuvintele cheie în toate emailurile din cont (Ctrl+S)"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "An_ulează"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Se indexează contul %s"
 
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Refă"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "_Taie"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary Mail"
 
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "Li_pește"
+#~ msgid "Send and receive email"
+#~ msgstr "Trimite și primește emailuri"
 
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Stânga"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Email;E-mail;Mail;Poștă;Electronică;"
 
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Dreapta"
+#~ msgid "Compose Message"
+#~ msgstr "Compune un mesaj"
 
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Centru"
+#~ msgid "Copyright 2011-2014 Yorba Foundation"
+#~ msgstr "Drepturi de autor 2011-2014 Fundația Yorba"
 
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Aliniază la margini"
+#~ msgid "_Delete"
+#~ msgstr "Ș_terge"
 
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Legătură (Ctrl+L)"
+#~ msgid "_Trash"
+#~ msgstr "Mu_tă la gunoi"
 
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "Cul_oare"
+#~ msgid "Move conversation to trash (Delete, Backspace)"
+#~ msgstr "Mută conversația la Gunoi (Delete, Backspace)"
 
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Mai multe opțiuni"
+#~ msgid "Move conversations to trash (Delete, Backspace)"
+#~ msgstr "Mută conversațiile la gunoi (Delete, Backspace)"
 
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Citează text (Ctrl+])"
+#~ msgid "_Donate"
+#~ msgstr "_Donează"
 
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Anulează citatul (Ctrl+[)"
+#~ msgid "attach|enclosed|enclosing|cover letter"
+#~ msgstr "atașament|încadrat|atașat|atașând|anexănd|anexă"
 
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Elimină fomatarea (Ctrl+Space)"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Renunțați la acest mesaj nesalvat?"
 
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Lipește cu _formatare"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Îngroșat (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Italic (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Subliniat (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Tăiat (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "Text cu fo_rmatare"
-
-#: ../ui/composer.glade.h:23
-msgid "Lar_ge"
-msgstr "Ma_re"
-
-#: ../ui/composer.glade.h:24
-msgid "Large"
-msgstr "Mare"
-
-#: ../ui/composer.glade.h:25
-msgid "_Medium"
-msgstr "_Mediu"
-
-#: ../ui/composer.glade.h:26
-msgid "Medium"
-msgstr "Mediu"
-
-#: ../ui/composer.glade.h:27
-msgid "_Small"
-msgstr "_Mic"
-
-#: ../ui/composer.glade.h:28
-msgid "Small"
-msgstr "Mic"
-
-#: ../ui/composer.glade.h:29
-msgid "S_ans Serif"
-msgstr "Fără s_erife"
-
-#: ../ui/composer.glade.h:30
-msgid "Sans Serif"
-msgstr "Fără serife"
-
-#: ../ui/composer.glade.h:31
-msgid "S_erif"
-msgstr "Cu s_erife"
-
-#: ../ui/composer.glade.h:32
-msgid "Serif"
-msgstr "Cu serife"
-
-#: ../ui/composer.glade.h:33
-msgid "_Fixed Width"
-msgstr "Lățime _fixă"
-
-#: ../ui/composer.glade.h:34
-msgid "Fixed Width"
-msgstr "Lățime fixă"
-
-#: ../ui/composer.glade.h:35
-#| msgid "_Attach"
-msgid "Detach"
-msgstr "Detașează"
-
-#: ../ui/composer.glade.h:36
-msgid "_Send"
-msgstr "_Trimite"
-
-#: ../ui/composer.glade.h:37
-#| msgid "_Send"
-msgid "Send"
-msgstr "Trimite"
-
-#: ../ui/composer.glade.h:38
-msgid "_Attach File"
-msgstr "_Atașează fișier"
-
-#: ../ui/composer.glade.h:39
-#| msgid "_Attach File"
-msgid "Attach File"
-msgstr "Atașează fișier"
-
-#: ../ui/composer.glade.h:40
-msgid "_Include Original Attachments"
-msgstr "_Include atașamentele originale"
-
-#: ../ui/composer.glade.h:41
-msgid "Include Original Attachments"
-msgstr "Include atașamentele originale"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:43
-#| msgid "_To:"
-msgid "_To"
-msgstr "Că_tre"
-
-#: ../ui/composer.glade.h:44
-#| msgid "_Cc:"
-msgid "_Cc"
-msgstr "_Cc"
-
-#: ../ui/composer.glade.h:45
-#| msgid "_Subject:"
-msgid "_Subject"
-msgstr "_Subiect"
-
-#: ../ui/composer.glade.h:46
-#| msgid "_Bcc:"
-msgid "_Bcc"
-msgstr "_Bcc"
-
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:48
-#| msgid "From:"
-msgid "From"
-msgstr "De la"
-
-#: ../ui/composer.glade.h:49
-msgid "Drop files here"
-msgstr "Trage fișiere aici"
-
-#: ../ui/composer.glade.h:50
-msgid "To add them as attachments"
-msgstr "Pentru a le atașa"
-
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Caută:"
-
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Precedentul"
-
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Următorul"
-
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "Majus_cule semnificative"
-
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "etichetă"
-
-#: ../ui/login.glade.h:1
-msgid "Password"
-msgstr "Parolă"
-
-#: ../ui/login.glade.h:2
-#| msgid "E_mail address:"
-msgid "E_mail address"
-msgstr "Adresă de e_mail"
-
-#: ../ui/login.glade.h:3
-#| msgid "_Password:"
-msgid "_Password"
-msgstr "_Parolă"
-
-#: ../ui/login.glade.h:4
-#| msgid "S_ervice:"
-msgid "S_ervice"
-msgstr "S_erviciu"
-
-#: ../ui/login.glade.h:5
-#| msgid "N_ame:"
-msgid "N_ame"
-msgstr "N_ume"
-
-#: ../ui/login.glade.h:7
-#| msgid "N_ickname:"
-msgid "N_ickname"
-msgstr "Pseu_donim"
-
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Muncă, Acasă, etc."
-
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_Salvează mailul trimis"
-
-#: ../ui/login.glade.h:10
-msgid "IMAP settings"
-msgstr "Configurări IMAP"
-
-#: ../ui/login.glade.h:11
-#| msgid "Se_rver:"
-msgid "Se_rver"
-msgstr "Se_rver"
-
-#: ../ui/login.glade.h:12
-#| msgid "P_ort:"
-msgid "P_ort"
-msgstr "P_ort"
-
-#: ../ui/login.glade.h:13
-#| msgid "Ser_ver:"
-msgid "Ser_ver"
-msgstr "Ser_ver"
-
-#: ../ui/login.glade.h:14
-#| msgid "Por_t:"
-msgid "Por_t"
-msgstr "Por_t"
-
-#: ../ui/login.glade.h:15
-msgid "SMTP settings"
-msgstr "Configurări SMTP"
-
-#: ../ui/login.glade.h:16
-#| msgid "User_name:"
-msgid "User_name"
-msgstr "_Nume utilizator"
-
-#: ../ui/login.glade.h:17
-#| msgid "Pass_word:"
-msgid "Pass_word"
-msgstr "Pa_rolă"
-
-#: ../ui/login.glade.h:18
-msgid "SMTP username"
-msgstr "Nume utilizator SMTP"
-
-#: ../ui/login.glade.h:19
-msgid "SMTP password"
-msgstr "Parolă SMTP"
-
-#: ../ui/login.glade.h:20
-#| msgid "_Username:"
-msgid "_Username"
-msgstr "Nume _utilizator"
-
-#: ../ui/login.glade.h:21
-msgid "IMAP username"
-msgstr "Nume utilizator IMAP"
-
-#: ../ui/login.glade.h:22
-msgid "IMAP password"
-msgstr "Parolă IMAP"
-
-#: ../ui/login.glade.h:23
-msgid "Encr_yption"
-msgstr "Crip_tare"
-
-#: ../ui/login.glade.h:24
-msgid "Encrypt_ion"
-msgstr "Cri_ptare"
-
-#: ../ui/login.glade.h:26
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
-
-#: ../ui/login.glade.h:27
-msgid "STARTTLS"
-msgstr "STARTTLS"
-
-#: ../ui/login.glade.h:28
-msgid "No authentication re_quired"
-msgstr "Nu este necesară autentificarea"
-
-#: ../ui/login.glade.h:29
-msgid "Use IMAP cre_dentials"
-msgstr "Folosește cre_dențiale IMAP"
-
-#: ../ui/login.glade.h:30
-msgid "Storage"
-msgstr "Păstrare"
-
-#: ../ui/login.glade.h:31
-#| msgid "_Download mail:"
-msgid "_Download mail"
-msgstr "_Descarcă email"
-
-#: ../ui/login.glade.h:32 ../ui/preferences.glade.h:6
-msgid "Composer"
-msgstr "Compunere"
-
-#: ../ui/login.glade.h:33
-msgid "Save dra_fts on server"
-msgstr "Salvează cior_nele pe server"
-
-#: ../ui/login.glade.h:34
-msgid "Si_gn emails:"
-msgstr "Se_mnează emailuri:"
-
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "Detalii cont SMTP"
-
-#: ../ui/password-dialog.glade.h:2
-msgid "Username:"
-msgstr "Nume utilizator:"
-
-#: ../ui/password-dialog.glade.h:3
-msgid "Password:"
-msgstr "Parolă:"
-
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Memorează parola"
+#~ msgid "Please enter your password"
+#~ msgstr "Introduceți parola"
 
-#: ../ui/preferences.glade.h:1
-#| msgid "_Preferences"
-msgid "Preferences"
-msgstr "Preferințe"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Contul nu poate fi eliminat</span> "
 
-#: ../ui/preferences.glade.h:3
-msgid "Reading"
-msgstr "Citire"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "O fereastră de compunere asociată cu acest cont este deschisă. Trimiteți sau "
+#~ "anulați mesajul și încearcați din nou."
 
-#: ../ui/preferences.glade.h:4
-msgid "_Automatically select next message"
-msgstr "_Selectează automat următorul mesaj"
+#~ msgid "Add account"
+#~ msgstr "Adaugă cont"
 
-#: ../ui/preferences.glade.h:5
-msgid "_Display conversation preview"
-msgstr "_Afișează previzualizarea conversației"
+#~ msgid "Edit account"
+#~ msgstr "Editează cont"
 
-#: ../ui/preferences.glade.h:7
-msgid "Enable _spell checking"
-msgstr "Activează _verificarea ortografică"
+#~ msgid "Remove account"
+#~ msgstr "Șterge cont"
 
-#: ../ui/preferences.glade.h:8
-msgid "Notifications"
-msgstr "Notificări"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Așteptați cât timp Geary vă validează contul."
 
-#: ../ui/preferences.glade.h:9
-msgid "_Play notification sounds"
-msgstr "_Redă notificările sonore"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Conexiune fără încredere"
 
-#: ../ui/preferences.glade.h:10
-msgid "Show _notifications for new mail"
-msgstr "Afișează _notificări pentru emailuri noi"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "Mă încred întotdeauna în _acest server"
 
-#: ../ui/preferences.glade.h:11
-msgid "Notify of new mail at start_up"
-msgstr "Notifică despre emailuri noi la _pornire"
+#~ msgid "_Trust This Server"
+#~ msgstr "Mă încred în acest se_rver"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Sigur vreți să eliminați acest "
-"cont?</span> "
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "Nu mă încre_d în acest server"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Toate emailurile asociate cu acest cont vor fi eliminate de pe computerul "
-"dumneavoastra. Emailurile de pe server nu vor fi afectate."
+#~ msgid "_Undo"
+#~ msgstr "An_ulează"
+
+#~ msgid "_Redo"
+#~ msgstr "_Refă"
+
+#~ msgid "Cu_t"
+#~ msgstr "_Taie"
+
+#~ msgid "_Paste"
+#~ msgstr "Li_pește"
+
+#~ msgid "_Left"
+#~ msgstr "_Stânga"
+
+#~ msgid "_Right"
+#~ msgstr "_Dreapta"
+
+#~ msgid "_Center"
+#~ msgstr "_Centru"
+
+#~ msgid "_Justify"
+#~ msgstr "_Aliniază la margini"
+
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Legătură (Ctrl+L)"
+
+#~ msgid "C_olor"
+#~ msgstr "Cul_oare"
+
+#~ msgid "More options"
+#~ msgstr "Mai multe opțiuni"
+
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Citează text (Ctrl+])"
+
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Anulează citatul (Ctrl+[)"
+
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Elimină fomatarea (Ctrl+Space)"
+
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Lipește cu _formatare"
+
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Îngroșat (Ctrl+B)"
+
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Italic (Ctrl+I)"
+
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Subliniat (Ctrl+U)"
+
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Tăiat (Ctrl+K)"
+
+#~ msgid "_Rich Text"
+#~ msgstr "Text cu fo_rmatare"
+
+#~ msgid "Lar_ge"
+#~ msgstr "Ma_re"
+
+#~ msgid "Large"
+#~ msgstr "Mare"
+
+#~ msgid "_Medium"
+#~ msgstr "_Mediu"
+
+#~ msgid "Medium"
+#~ msgstr "Mediu"
+
+#~ msgid "_Small"
+#~ msgstr "_Mic"
+
+#~ msgid "Small"
+#~ msgstr "Mic"
+
+#~ msgid "S_ans Serif"
+#~ msgstr "Fără s_erife"
+
+#~ msgid "Sans Serif"
+#~ msgstr "Fără serife"
+
+#~ msgid "S_erif"
+#~ msgstr "Cu s_erife"
+
+#~ msgid "Serif"
+#~ msgstr "Cu serife"
+
+#~ msgid "_Fixed Width"
+#~ msgstr "Lățime _fixă"
+
+#~ msgid "Fixed Width"
+#~ msgstr "Lățime fixă"
+
+#~| msgid "_Attach"
+#~ msgid "Detach"
+#~ msgstr "Detașează"
+
+#~ msgid "_Send"
+#~ msgstr "_Trimite"
+
+#~| msgid "_Send"
+#~ msgid "Send"
+#~ msgstr "Trimite"
+
+#~ msgid "_Attach File"
+#~ msgstr "_Atașează fișier"
+
+#~| msgid "_Attach File"
+#~ msgid "Attach File"
+#~ msgstr "Atașează fișier"
+
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Include atașamentele originale"
+
+#~ msgid "Include Original Attachments"
+#~ msgstr "Include atașamentele originale"
+
+#~| msgid "_To:"
+#~ msgid "_To"
+#~ msgstr "Că_tre"
+
+#~| msgid "_Cc:"
+#~ msgid "_Cc"
+#~ msgstr "_Cc"
+
+#~| msgid "_Subject:"
+#~ msgid "_Subject"
+#~ msgstr "_Subiect"
+
+#~| msgid "_Bcc:"
+#~ msgid "_Bcc"
+#~ msgstr "_Bcc"
+
+#~| msgid "From:"
+#~ msgid "From"
+#~ msgstr "De la"
+
+#~ msgid "Drop files here"
+#~ msgstr "Trage fișiere aici"
+
+#~ msgid "To add them as attachments"
+#~ msgstr "Pentru a le atașa"
+
+#~ msgid "Find:"
+#~ msgstr "Caută:"
+
+#~ msgid "_Previous"
+#~ msgstr "_Precedentul"
+
+#~ msgid "_Next"
+#~ msgstr "_Următorul"
+
+#~ msgid "_Case sensitive"
+#~ msgstr "Majus_cule semnificative"
+
+#~ msgid "label"
+#~ msgstr "etichetă"
+
+#~ msgid "Password"
+#~ msgstr "Parolă"
+
+#~| msgid "E_mail address:"
+#~ msgid "E_mail address"
+#~ msgstr "Adresă de e_mail"
+
+#~| msgid "_Password:"
+#~ msgid "_Password"
+#~ msgstr "_Parolă"
+
+#~| msgid "S_ervice:"
+#~ msgid "S_ervice"
+#~ msgstr "S_erviciu"
+
+#~| msgid "N_ame:"
+#~ msgid "N_ame"
+#~ msgstr "N_ume"
+
+#~| msgid "N_ickname:"
+#~ msgid "N_ickname"
+#~ msgstr "Pseu_donim"
+
+#~ msgid "Work, Home, etc."
+#~ msgstr "Muncă, Acasă, etc."
+
+#~ msgid "_Save sent mail"
+#~ msgstr "_Salvează mailul trimis"
+
+#~ msgid "IMAP settings"
+#~ msgstr "Configurări IMAP"
+
+#~| msgid "Se_rver:"
+#~ msgid "Se_rver"
+#~ msgstr "Se_rver"
+
+#~| msgid "P_ort:"
+#~ msgid "P_ort"
+#~ msgstr "P_ort"
+
+#~| msgid "Ser_ver:"
+#~ msgid "Ser_ver"
+#~ msgstr "Ser_ver"
+
+#~| msgid "Por_t:"
+#~ msgid "Por_t"
+#~ msgstr "Por_t"
+
+#~ msgid "SMTP settings"
+#~ msgstr "Configurări SMTP"
+
+#~| msgid "User_name:"
+#~ msgid "User_name"
+#~ msgstr "_Nume utilizator"
+
+#~| msgid "Pass_word:"
+#~ msgid "Pass_word"
+#~ msgstr "Pa_rolă"
+
+#~ msgid "SMTP username"
+#~ msgstr "Nume utilizator SMTP"
+
+#~ msgid "SMTP password"
+#~ msgstr "Parolă SMTP"
+
+#~| msgid "_Username:"
+#~ msgid "_Username"
+#~ msgstr "Nume _utilizator"
+
+#~ msgid "IMAP username"
+#~ msgstr "Nume utilizator IMAP"
+
+#~ msgid "IMAP password"
+#~ msgstr "Parolă IMAP"
+
+#~ msgid "Encr_yption"
+#~ msgstr "Crip_tare"
+
+#~ msgid "Encrypt_ion"
+#~ msgstr "Cri_ptare"
+
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
+
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
+
+#~ msgid "No authentication re_quired"
+#~ msgstr "Nu este necesară autentificarea"
+
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Folosește cre_dențiale IMAP"
+
+#~ msgid "Storage"
+#~ msgstr "Păstrare"
+
+#~| msgid "_Download mail:"
+#~ msgid "_Download mail"
+#~ msgstr "_Descarcă email"
+
+#~ msgid "Composer"
+#~ msgstr "Compunere"
+
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Salvează cior_nele pe server"
+
+#~ msgid "Si_gn emails:"
+#~ msgstr "Se_mnează emailuri:"
+
+#~ msgid "SMTP Credentials"
+#~ msgstr "Detalii cont SMTP"
+
+#~ msgid "Username:"
+#~ msgstr "Nume utilizator:"
+
+#~ msgid "Password:"
+#~ msgstr "Parolă:"
+
+#~ msgid "_Remember password"
+#~ msgstr "_Memorează parola"
+
+#~| msgid "_Preferences"
+#~ msgid "Preferences"
+#~ msgstr "Preferințe"
+
+#~ msgid "Reading"
+#~ msgstr "Citire"
+
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Selectează automat următorul mesaj"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Afișează previzualizarea conversației"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Activează _verificarea ortografică"
+
+#~ msgid "Notifications"
+#~ msgstr "Notificări"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Redă notificările sonore"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Afișează _notificări pentru emailuri noi"
+
+#~ msgid "Notify of new mail at start_up"
+#~ msgstr "Notifică despre emailuri noi la _pornire"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Sigur vreți să eliminați acest "
+#~ "cont?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Toate emailurile asociate cu acest cont vor fi eliminate de pe computerul "
+#~ "dumneavoastra. Emailurile de pe server nu vor fi afectate."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Pseudonim:"
+#~ msgid "Nickname:"
+#~ msgstr "Pseudonim:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Adresă de email:"
+#~ msgid "Email address:"
+#~ msgstr "Adresă de email:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary upgrade in progress."
-msgstr "În curs de înnoire Geary."
+#~ msgid "Geary upgrade in progress."
+#~ msgstr "În curs de înnoire Geary."
 
 #~ msgid "C_lose"
 #~ msgstr "În_chide"
diff --git a/po/ru.po b/po/ru.po
index 968cf30..3bb88f6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -14,460 +14,430 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-10-23 05:28+0000\n"
-"PO-Revision-Date: 2015-07-13 14:00+0300\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:10+0000\n"
 "Last-Translator: Stas Solovey <whats_up tut by>\n"
 "Language-Team: Русский <gnome-cyr gnome org>\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-"X-Generator: Gtranslator 2.91.7\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Почтовый клиент"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Почтовый клиент Geary"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Отправка и получение электронной почты"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Электронная;Почта;Email;E-mail;Mail;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Новое сообщение"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Отправить по эл. почте"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Отправить файлы с помощью Geary"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Сохранить"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:55+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: ru\n"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Добавить"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Черновики | Drafts | Draft"
 
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "Дополнительные адреса для %s"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr "Отправленные | Sent | Sent Mail | Sent Email | Sent E-Mail"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Учётные записи"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+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"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Имя Фамилия"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Корзина | Удалённые | Удаленные | Trash | Rubbish | Rubbish Bin"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Welcome to Geary."
-msgstr "Добро пожаловать в Geary."
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr "Архив | Архивы | Archive | Archives"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Enter your account information to get started."
-msgstr "Чтобы приступить к работе, введите информацию об учётной записи."
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Входящие"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "2 weeks back"
-msgstr "За последние 2 недели"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Черновики"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "1 month back"
-msgstr "За последний месяц"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Отправленные"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "3 months back"
-msgstr "За последние 3 месяца"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Избранные"
 
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "6 months back"
-msgstr "За последние 6 месяцев"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Важное"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "1 year back"
-msgstr "За последний год"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Вся почта"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-msgid "2 years back"
-msgstr "За последние 2 года"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Спам"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-msgid "4 years back"
-msgstr "За последние 4 года"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Корзина"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "Everything"
-msgstr "За всё время"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Исходящие"
 
-#: ../src/client/accounts/add-edit-page.vala:280
-msgid "Edit"
-msgstr "Правка"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Поиск"
 
-#: ../src/client/accounts/add-edit-page.vala:282
-msgid "Preview"
-msgstr "Предварительный просмотр"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Архив"
 
-#: ../src/client/accounts/add-edit-page.vala:723
-msgid "Remem_ber passwords"
-msgstr "Зап_омнить пароли"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Нет"
 
-#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "За_помнить пароль"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:764
-msgid "Unable to validate:\n"
-msgstr "Не удалось подтвердить:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:766
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Неверный псевдоним учётной записи.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:769
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; Адрес электронной почты уже добавлен в Geary.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:773
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; Ошибка подключения к IMAP.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:776
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; Неверные имя пользователя или пароль IMAP.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Другой"
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; Ошибка подключения к SMTP.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "вложение"
 
-#: ../src/client/accounts/add-edit-page.vala:782
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; Неверные имя пользователя или пароль SMTP.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "скрытая копия"
 
-#: ../src/client/accounts/add-edit-page.vala:786
-msgid "        &#8226; Connection error.\n"
-msgstr ""
-"        &#8226; Ошибка подключения.\n"
-"\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "тело"
 
-#: ../src/client/accounts/add-edit-page.vala:790
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Неверные имя пользователя или пароль.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "копия"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Авторское право © 2011-2015 Yorba Foundation"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "от"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Посетить веб-сайт Yorba"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "тема"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Запускать Geary свёрнутым"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "кому"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Выводить отладочную информацию"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "я"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Записывать мониторинг бесед"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(без темы)"
 
-# What is "deserialization"?
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Записывать десериализацию сети"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%A, %-e %b. %Y в %-l:%M %p"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Записывать сетевую активность"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "В %1$s, %2$s написал:"
 
-#. / 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 "Записывать ответ IMAP"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s написал:"
 
-#. / 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 "Записывать сериализацию сети"
+#. / 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:234
+msgid "On %s:"
+msgstr "В %s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Записывать периодическую активность"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Пересылаемое сообщение ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Записывать запросы базы данных (создаёт множество сообщений)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "От: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Записывать синхронизацию папки"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Тема: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Разрешить проверку WebView"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Дата: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Отозвать все сертификаты серверов с предупреждениями TLS"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Кому: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Показать версию приложения"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Копия: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Используйте %s для открытия нового окна редактора"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "нет"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Комментарии, пожелания и найденные ошибки отправляйте:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Почтовый клиент"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Не удалось разобрать параметры командной строки: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "Авторское право © 2011-2015 Yorba Foundation"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Неизвестный параметр командной строки «%s»\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Посетить веб-сайт Yorba"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:61
 msgid "Delete conversation"
 msgstr "Удалить беседу"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Удалить беседу (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Удалить беседы (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:67
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Переместить беседу в корзину (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:68
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "Переместить беседы в корзину (Delete, Backspace)"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Архивировать"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Архивировать беседу (A)"
 
-#: ../src/client/application/geary-controller.vala:75
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Архивировать беседы (A)"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Отметить как С_пам"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Отметить как _не Спам"
 
-#: ../src/client/application/geary-controller.vala:81
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Отметить беседу"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Отметить беседы"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Добавить метку беседе"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Добавить метку беседам"
 
-#: ../src/client/application/geary-controller.vala:85
-#: ../src/client/application/geary-controller.vala:436
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Переместить беседу"
 
-#: ../src/client/application/geary-controller.vala:86
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Переместить беседы"
 
-#: ../src/client/application/geary-controller.vala:373
-#: ../ui/app_menu.interface.h:1
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "_Учётные записи"
 
-#: ../src/client/application/geary-controller.vala:378
-#: ../src/client/components/stock.vala:27 ../ui/app_menu.interface.h:2
+#: ../src/client/application/geary-controller.vala:377
+#: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Параметры"
 
-#: ../src/client/application/geary-controller.vala:382
-#: ../src/client/components/stock.vala:25 ../ui/app_menu.interface.h:4
+#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Справка"
 
-#: ../src/client/application/geary-controller.vala:386
-#: ../src/client/components/stock.vala:21 ../ui/app_menu.interface.h:5
+#: ../src/client/application/geary-controller.vala:385
+#: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_О приложении"
 
-#: ../src/client/application/geary-controller.vala:390
-#: ../ui/app_menu.interface.h:3
-msgid "_Donate"
-msgstr "Помочь _разработчикам"
-
-#: ../src/client/application/geary-controller.vala:394
-#: ../src/client/components/stock.vala:29 ../ui/app_menu.interface.h:6
+#: ../src/client/application/geary-controller.vala:389
+#: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Завершить"
 
-#: ../src/client/application/geary-controller.vala:399
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Отметить как…"
 
-#: ../src/client/application/geary-controller.vala:405
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Отметить как _Прочитанное"
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Отметить как _Непрочитанное"
 
-#: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Добавить в избранное"
 
-#: ../src/client/application/geary-controller.vala:422
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "_Убрать из избранных"
 
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Добавить метку"
 
-#: ../src/client/application/geary-controller.vala:433
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Метка"
 
-#: ../src/client/application/geary-controller.vala:437
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Переместить"
 
-#: ../src/client/application/geary-controller.vala:441
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Создать новую беседу (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:445
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Ответить"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Ответить (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:450
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "О_тветить всем"
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Ответить всем (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Переслать"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Переслать (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:496
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr "Очистить"
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr "Очистить Корзину или Спам"
 
-#: ../src/client/application/geary-controller.vala:501
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr "Очистить _Спам…"
 
-#: ../src/client/application/geary-controller.vala:505
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr "Очистить _Корзину…"
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:538
+#: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
 msgstr "Включить панель поиска"
 
-#: ../src/client/application/geary-controller.vala:752
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Не удалось добавить исключение безопасности сервера"
 
-#: ../src/client/application/geary-controller.vala:989
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Параметры небезопасны"
 
-#: ../src/client/application/geary-controller.vala:990
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -477,17 +447,17 @@ msgstr ""
 "что ваши имя пользователя и пароль могут быть перехвачены сторонними лицами. "
 "Уверены, что хотите продолжить?"
 
-#: ../src/client/application/geary-controller.vala:991
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "_Продолжить"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Ошибка отправки эл. почты"
 
-#: ../src/client/application/geary-controller.vala:1070
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -495,14 +465,12 @@ msgstr ""
 "В Geary произошла ошибка при отправке электронной почты. Если проблема не "
 "устраняется, вручную удалите почту из папки «Исходящие»."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Ошибка сохранения отправленной почты"
 
-#: ../src/client/application/geary-controller.vala:1075
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -510,20 +478,15 @@ msgstr ""
 "В Geary произошла ошибка при сохранении отправленного сообщения в папку "
 "«Отправленные». Сообщение будет в папке «Исходящие» пока вы не удалите его."
 
-#: ../src/client/application/geary-controller.vala:1144
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Метки"
 
-#. 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:1156
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Не удалось открыть базу данных для %s"
 
-#: ../src/client/application/geary-controller.vala:1157
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -547,21 +510,19 @@ msgstr ""
 "Пересоздание базы данных уничтожит все локальные письма и их вложения. "
 "<b>Операция не затронет почту, хранящуюся на сервере.</b>"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "Пересоздать"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "_Завершить"
 
-#: ../src/client/application/geary-controller.vala:1168
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Не удалось пересоздать базу данных для «%s»"
 
-#: ../src/client/application/geary-controller.vala:1169
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -571,17 +532,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1191
-#: ../src/client/application/geary-controller.vala:1201
-#: ../src/client/application/geary-controller.vala:1212
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Не удалось открыть локальный почтовый ящик для %s"
 
-#: ../src/client/application/geary-controller.vala:1192
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -598,7 +555,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1202
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -610,9 +567,9 @@ msgstr ""
 "сожалению, невозможно произвести изменение базы данных для работы с этой "
 "версией Geary.\n"
 "\n"
-"Установите последнюю версию Geary и попробуйте снова.  "
+"Установите последнюю версию Geary и попробуйте снова."
 
-#: ../src/client/application/geary-controller.vala:1213
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -624,27 +581,30 @@ msgstr ""
 "\n"
 "Проверьте подключение к сети и перезапустите Geary."
 
-#: ../src/client/application/geary-controller.vala:1721
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "О %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1724
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
-msgstr "Stas Solovey <whats_up tut by>, 2015."
+msgstr ""
+"Stas Solovey <whats_up tut by>, 2015.\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Stas Solovey https://launchpad.net/~whats-up\n";
+"  Yuly Nesterov https://launchpad.net/~inpr1se";
 
-#: ../src/client/application/geary-controller.vala:1990
+#: ../src/client/application/geary-controller.vala:1976
 msgid "Undo move (Ctrl+Z)"
 msgstr "Отменить перемещение (Ctrl+U)"
 
-#: ../src/client/application/geary-controller.vala:2000
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Действительно открыть «%s»?"
 
-#: ../src/client/application/geary-controller.vala:2001
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -652,300 +612,537 @@ msgstr ""
 "Вложения при открытии могут нанести ущерб системе. Открывайте вложения "
 "только от надёжных источников."
 
-#: ../src/client/application/geary-controller.vala:2002
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Не _спрашивать снова"
 
-#: ../src/client/application/geary-controller.vala:2020
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Файл с именем «%s» уже существует. Заменить его?"
 
-#: ../src/client/application/geary-controller.vala:2022
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "Файл уже существует в «%s». Его замена приведёт к полной перезаписи его "
 "содержимого."
 
-#: ../src/client/application/geary-controller.vala:2025
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Заменить"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2323
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Закрыть черновик?"
 
-#: ../src/client/application/geary-controller.vala:2453
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr "Очистить все письма папки %s?"
 
-#: ../src/client/application/geary-controller.vala:2454
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr "Удаляет все письма из Geary и почтового сервера."
 
-#: ../src/client/application/geary-controller.vala:2455
+#: ../src/client/application/geary-controller.vala:2441
 msgid "This cannot be undone."
 msgstr "Это не может быть отменено."
 
-#: ../src/client/application/geary-controller.vala:2456
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr "Очистить %s"
 
-#: ../src/client/application/geary-controller.vala:2473
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 msgid "Error emptying %s"
 msgstr "Ошибка очистки %s"
 
-#: ../src/client/application/geary-controller.vala:2503
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Безвозвратно удалить это сообщение?"
 msgstr[1] "Безвозвратно удалить эти сообщения?"
 msgstr[2] "Безвозвратно удалить эти сообщения?"
 
-#: ../src/client/application/geary-controller.vala:2505
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "_Удалить"
 
-#: ../src/client/application/geary-controller.vala:2536
+#: ../src/client/application/geary-controller.vala:2522
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Отменить архивирование (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2551
+#: ../src/client/application/geary-controller.vala:2537
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Отменить перемещение в корзину (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2604
+#: ../src/client/application/geary-controller.vala:2590
 msgid "Undo (Ctrl+Z)"
 msgstr "Отменить (Ctrl+Z)"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i совпадение"
-msgstr[1] "%i совпадения"
-msgstr[2] "%i совпадений"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Запускать Geary свёрнутым"
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i совпадение (от начала)"
-msgstr[1] "%i совпадения (от начала)"
-msgstr[2] "%i совпадений (от начала)"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Выводить отладочную информацию"
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "не найдено"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Записывать мониторинг бесед"
 
-#: ../src/client/components/main-window.vala:430
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Записывать десериализацию сети"
 
-#: ../src/client/components/search-bar.vala:10
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Поиск"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Записывать сетевую активность"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:25
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Поиск по всей почте учётной записи по ключевым словам (Ctrl+S)"
+#. / 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 "Записывать ответ IMAP"
 
-#: ../src/client/components/search-bar.vala:118
-#, c-format
-msgid "Indexing %s account"
-msgstr "Индексируется учётная запись %s"
+#. / 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 "Записывать сериализацию сети"
 
-#: ../src/client/components/search-bar.vala:129
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Поиск учётной записи %s"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Записывать периодическую активность"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Отправка…"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Записывать запросы базы данных (создаёт множество сообщений)"
 
-#: ../src/client/components/stock.vala:18 ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_ОК"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Записывать синхронизацию папки"
 
-#: ../src/client/components/stock.vala:19 ../ui/edit_alternate_emails.glade.h:3
-#: ../ui/password-dialog.glade.h:5 ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "О_тмена"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Разрешить проверку WebView"
 
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Закрыть"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Отозвать все сертификаты серверов с предупреждениями TLS"
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "От_казаться"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Показать версию приложения"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "Отк_рыть"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Используйте %s для открытия нового окна редактора"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Печать…"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Комментарии, пожелания и найденные ошибки отправляйте:"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Удалить"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Не удалось разобрать параметры командной строки: %s\n"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "Выбрать _все"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Неизвестный параметр командной строки «%s»\n"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "О_ставить"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "Новые сообщения — %s"
 
-#: ../src/client/composer/composer-widget.vala:73
-msgid "Saved"
-msgstr "Сохранён"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d новое сообщение"
+msgstr[1] "%d новых сообщения"
+msgstr[2] "%d новых сообщений"
 
-#: ../src/client/composer/composer-widget.vala:74
-msgid "Saving"
-msgstr "Сохраняется"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, всего %d новое сообщение"
+msgstr[1] "%s, всего %d новых сообщения"
+msgstr[2] "%s, всего %d новых сообщений"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "Error saving"
-msgstr "Ошибка сохранения"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d другое сообщение для %s)"
+msgstr[1] ""
+"%s\n"
+"(%d других сообщения для %s)"
+msgstr[2] ""
+"%s\n"
+"(%d других сообщений для %s)"
 
-#: ../src/client/composer/composer-widget.vala:76
-msgid "Press Backspace to delete quote"
-msgstr "Нажмите клавишу Backspace для удаления цитаты"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Открыть"
 
-#: ../src/client/composer/composer-widget.vala:77
-msgid "New Message"
-msgstr "Новое сообщение"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Я"
 
-#. A 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:138
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr "Недоверенное соединение: %s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
+"Данные авторизации сервера почты %s на %s:%u не могут быть проверены."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
 msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
-"прикрепить|прикрепление|прикрепления|прикреплён|прикреплены|вложение|"
-"вложенные|вложения"
+"Выбор «Доверять этому серверу» или «Всегда доверять этому серверу» может "
+"привести к небезопасной передаче имени пользователя и пароля."
 
-#: ../src/client/composer/composer-widget.vala:1102
-#: ../src/client/composer/composer-widget.vala:1106
-msgid "Do you want to discard this message?"
-msgstr "Отказаться от этого сообщения?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"Выбор «Не доверять этому серверу» приведёт к потере доступа к этому серверу."
 
-#: ../src/client/composer/composer-widget.vala:1262
-msgid "Send message with an empty subject and body?"
-msgstr "Отправить сообщение с пустой темой и без текста?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Geary не добавит и не изменит эту учётную запись."
 
-#: ../src/client/composer/composer-widget.vala:1264
-msgid "Send message with an empty subject?"
-msgstr "Отправить сообщение с пустой темой?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"Выбор «Не доверять этому серверу» приведёт к остановке доступа к этому "
+"серверу."
 
-#: ../src/client/composer/composer-widget.vala:1266
-msgid "Send message with an empty body?"
-msgstr "Отправить сообщение без текста?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr "Geary завершит работу если нет других открытых учётных записей."
 
-#: ../src/client/composer/composer-widget.vala:1268
-msgid "Send message without an attachment?"
-msgstr "Отправить сообщение без прикреплённых файлов?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Свяжитесь с системным администратором или с провайдером электронной почты "
+"если есть какие-либо вопросы по данным проблемам."
 
-#: ../src/client/composer/composer-widget.vala:1530
-msgid "Cannot add attachment"
-msgstr "Невозможно добавить вложение"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr "Сертификат сервера не подписан известным центром сертификации"
 
-#: ../src/client/composer/composer-widget.vala:1541
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "Невозможно найти «%s»."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr "Учётные данные сервера не совпадают с учётными данными в сертификате"
 
-#: ../src/client/composer/composer-widget.vala:1548
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "«%s» является каталогом."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Сертификат сервера просрочен"
 
-#: ../src/client/composer/composer-widget.vala:1555
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "«%s» — пустой файл."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "Сертификат сервера не был активирован"
 
-#: ../src/client/composer/composer-widget.vala:1569
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "Невозможно открыть для чтения «%s»."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "Сертификат сервера был отозван и теперь недействителен"
 
-#: ../src/client/composer/composer-widget.vala:1576
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "«%s» уже вложено в письмо."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "Сертификат сервера считается небезопасным"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1585
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr "Произошла ошибка обработки сертификата сервера"
 
-#: ../src/client/composer/composer-widget.vala:1645
-msgid "To: "
-msgstr "Кому: "
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr "Geary требуется пароль эл. почты чтобы продолжить"
 
-#: ../src/client/composer/composer-widget.vala:1648
-msgid "Cc: "
-msgstr "Копия: "
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Выберите файл"
 
-#: ../src/client/composer/composer-widget.vala:1651
-msgid "Bcc: "
-msgstr "Скрытая копия:"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Прикрепить"
 
-#: ../src/client/composer/composer-widget.vala:1654
-msgid "Reply-To: "
-msgstr "Ответить: "
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr "Дополнительные адреса для %s"
 
-#: ../src/client/composer/composer-widget.vala:1887
-msgid "Select Color"
-msgstr "Выбрать цвет"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Учётные записи"
 
-#. 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:2322
-#, c-format
-msgid "%1$s via %2$s"
-msgstr "%1$s через %2$s"
+#. / 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 "Имя Фамилия"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2364
-msgid "_From:"
-msgstr "_От:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Добро пожаловать в Geary."
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Я"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Чтобы приступить к работе, введите информацию об учётной записи."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "За последние 2 недели"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "За последний месяц"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "За последние 3 месяца"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "За последние 6 месяцев"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "За последний год"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "За последние 2 года"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "За последние 4 года"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "За всё время"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "Правка"
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr "Предварительный просмотр"
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "Зап_омнить пароли"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "За_помнить пароль"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Не удалось подтвердить:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Неверный псевдоним учётной записи.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Адрес электронной почты уже добавлен в Geary.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Ошибка подключения к IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Неверные имя пользователя или пароль IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Ошибка подключения к SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; Неверные имя пользователя или пароль SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Ошибка подключения.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Неверные имя пользователя или пароль.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Сохранить"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Добавить"
+
+#. / 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 "%l:%M %P"
+
+#. / 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, %-l:%M %P"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Сейчас"
+
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "%d минута назад"
+msgstr[1] "%d минуты назад"
+msgstr[2] "%d минут назад"
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "%d час назад"
+msgstr[1] "%d часа назад"
+msgstr[2] "%d часов назад"
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Вчера"
+
+#. / 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
+msgid "%A"
+msgstr "%A"
+
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "байт"
+
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "ТБ"
+
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "ГБ"
+
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "МБ"
+
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "КБ"
+
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d сообщение"
+msgstr[1] "%d сообщения"
+msgstr[2] "%d сообщений"
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d непрочитанное"
+msgstr[1] "%d непрочитанных"
+msgstr[2] "%d непрочитанных"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Входящие"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Поиск учётной записи %s"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d результат"
+msgstr[1] "%d результата"
+msgstr[2] "%d результатов"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "Беседы не выбраны."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "%u беседа выбрана."
@@ -1001,7 +1198,6 @@ msgid "Date:"
 msgstr "Дата:"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "%u сообщение прочитано"
@@ -1009,33 +1205,30 @@ msgstr[1] "%u сообщения прочитаны"
 msgstr[2] "%u сообщений прочитано"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr "Сообщение успешно отправлено, но не может быть сохранено в %s."
 
-#. Add a menu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Копировать"
 
-#. Add a menu item for copying the address.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "Копировать эл. _адрес"
 
-#. Add a menu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Копировать _ссылку"
 
-#. Select message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "Выбрать сообщение"
 
-#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Выбрать _все"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "_Проверить"
@@ -1048,7 +1241,6 @@ msgstr "Кажется что эта ссылка ведёт на"
 msgid "but actually goes to"
 msgstr ", но на самом деле указывает на"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
 msgstr " (Небезопасная?)"
@@ -1072,12 +1264,10 @@ msgstr[0] "Сохранить вложение…"
 msgstr[1] "Сохранить вложения…"
 msgstr[2] "Сохранить вложения…"
 
-#. Reply to all on a message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "Ответить _всем"
 
-#. Mark as read/unread.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "Отметить как _прочитанное"
@@ -1090,1075 +1280,622 @@ msgstr "Отметить как _непрочитанное"
 msgid "Mark Unread From _Here"
 msgstr "Отметить как непрочитанные начиная с _этого"
 
-#. Separator.
-#. View original message source.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "_Показать исходник"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:378
-msgid "none"
-msgstr "нет"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "Не удалось запустить текстовый редактор по-умолчанию."
 
 #: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s — Проверка сообщений"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Выберите файл"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Сохранён"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Прикрепить"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Сохраняется"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
-msgid "Untrusted Connection: %s"
-msgstr "Недоверенное соединение: %s"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Ошибка сохранения"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
-msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr "Данные авторизации сервера почты %s на %s:%u не могут быть проверены."
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "Нажмите клавишу Backspace для удаления цитаты"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
-msgid ""
-"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-"your username and password to be transmitted insecurely."
-msgstr ""
-"Выбор «Доверять этому серверу» или «Всегда доверять этому серверу» может "
-"привести к небезопасной передаче имени пользователя и пароля."
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Новое сообщение"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-"server."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Выбор «Не доверять этому серверу» приведёт к потере доступа к этому серверу."
+"прикрепить|прикрепление|прикрепления|прикреплён|прикреплены|вложение|вложенны"
+"е|вложения"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
-msgid "Geary will not add or update this email account."
-msgstr "Geary не добавит и не изменит эту учётную запись."
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Отказаться от этого сообщения?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-"this account."
-msgstr ""
-"Выбор «Не доверять этому серверу» приведёт к остановке доступа к этому "
-"серверу."
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Отправить сообщение с пустой темой и без текста?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr "Geary завершит работу если нет других открытых учётных записей."
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Отправить сообщение с пустой темой?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
-msgid ""
-"Contact your system administrator or email service provider if you have any "
-"question about these issues."
-msgstr ""
-"Свяжитесь с системным администратором или с провайдером электронной почты "
-"если есть какие-либо вопросы по данным проблемам."
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Отправить сообщение без текста?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
-msgstr "Сертификат сервера не подписан известным центром сертификации"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Отправить сообщение без прикреплённых файлов?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
-msgid "The server's identity does not match the identity in the certificate"
-msgstr "Учётные данные сервера не совпадают с учётными данными в сертификате"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Невозможно добавить вложение"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
-msgid "The server's certificate has expired"
-msgstr "Сертификат сервера просрочен"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "Невозможно найти «%s»."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
-msgid "The server's certificate has not been activated"
-msgstr "Сертификат сервера не был активирован"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "«%s» является каталогом."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
-msgid "The server's certificate has been revoked and is now invalid"
-msgstr "Сертификат сервера был отозван и теперь недействителен"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "«%s» — пустой файл."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
-msgid "The server's certificate is considered insecure"
-msgstr "Сертификат сервера считается небезопасным"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "Невозможно открыть для чтения «%s»."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
-msgid "An error has occurred processing the server's certificate"
-msgstr "Произошла ошибка обработки сертификата сервера"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "«%s» уже вложено в письмо."
 
-#. 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 "Geary requires your email password to continue"
-msgstr "Geary требуется пароль эл. почты чтобы продолжить"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. 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 сообщение"
-msgstr[1] "%d сообщения"
-msgstr[2] "%d сообщений"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Кому: "
 
-#. / 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 непрочитанное"
-msgstr[1] "%d непрочитанных"
-msgstr[2] "%d непрочитанных"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Копия: "
 
-#. / 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/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Скрытая копия: "
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Входящие"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "Ответить: "
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d результат"
-msgstr[1] "%d результата"
-msgstr[2] "%d результатов"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Выбрать цвет"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "Новые сообщения — %s"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr "%1$s через %2$s"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d новое сообщение"
-msgstr[1] "%d новых сообщения"
-msgstr[2] "%d новых сообщений"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_От:"
 
-#: ../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 новое сообщение"
-msgstr[1] "%s, всего %d новых сообщения"
-msgstr[2] "%s, всего %d новых сообщений"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 другое сообщение для %s)"
-msgstr[1] ""
-"%s\n"
-"(%d других сообщения для %s)"
-msgstr[2] ""
-"%s\n"
-"(%d других сообщений для %s)"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Отправка…"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Открыть"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i совпадение"
+msgstr[1] "%i совпадения"
+msgstr[2] "%i совпадений"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i совпадение (от начала)"
+msgstr[1] "%i совпадения (от начала)"
+msgstr[2] "%i совпадений (от начала)"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "не найдено"
 
-#. / 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"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_ОК"
 
-#. / 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."
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "О_тмена"
 
-#. / 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"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Закрыть"
 
-#. / 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"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "От_казаться"
 
-#. / 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"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "Отк_рыть"
 
-#. / 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"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Печать…"
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Сейчас"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Удалить"
 
-#: ../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "%d минута назад"
-msgstr[1] "%d минуты назад"
-msgstr[2] "%d минут назад"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "О_ставить"
 
-#: ../src/client/util/util-date.vala:171
-#, c-format
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "%d час назад"
-msgstr[1] "%d часа назад"
-msgstr[2] "%d часов назад"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Поиск по всей почте учётной записи по ключевым словам (Ctrl+S)"
 
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "Вчера"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Индексируется учётная запись %s"
 
-#. / 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"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(без темы)"
+#~ msgid "Geary Mail"
+#~ msgstr "Почтовый клиент Geary"
 
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "байт"
+#~ msgid "Send and receive email"
+#~ msgstr "Отправка и получение электронной почты"
 
-#: ../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "ТБ"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Электронная;Почта;Email;E-mail;Mail;"
 
-#: ../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "ГБ"
+#~ msgid "Compose Message"
+#~ msgstr "Новое сообщение"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "МБ"
+#~ msgid "Send by email"
+#~ msgstr "Отправить по эл. почте"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "КБ"
+#~ msgid "Send files using Geary"
+#~ msgstr "Отправить файлы с помощью Geary"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#~ msgid "_Donate"
+#~ msgstr "Помочь _разработчикам"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Невозможно удалить учётную "
+#~ "запись</span> "
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Открыто окно редактирования писем, связанное с данной учётной записью. "
+#~ "Отправьте письмо или отмените его, затем попробуйте снова."
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Другой"
+#~ msgid "Add account"
+#~ msgstr "Добавить учётную запись"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#~ msgid "Edit account"
+#~ msgstr "Редактировать учётную запись"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#~ msgid "Remove account"
+#~ msgstr "Удалить учётную запись"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Входящие"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Подождите пока Geary проверит учётную запись."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Черновики"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Недоверенное соединение"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Отправленные"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "_Всегда доверять этому серверу"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Избранные"
+#~ msgid "_Trust This Server"
+#~ msgstr "_Доверять этому серверу"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Важное"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "_Не доверять этому серверу"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Вся почта"
+#~ msgid "_Undo"
+#~ msgstr "_Отменить"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Спам"
+#~ msgid "_Redo"
+#~ msgstr "В_ернуть"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Корзина"
+#~ msgid "Cu_t"
+#~ msgstr "_Вырезать"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Исходящие"
+#~ msgid "_Paste"
+#~ msgstr "В_ставить"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Архив"
+#~ msgid "_Left"
+#~ msgstr "По _левому краю"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-msgstr "Нет"
+#~ msgid "_Right"
+#~ msgstr "По _правому краю"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-msgid "attachment"
-msgstr "вложение"
+#~ msgid "_Center"
+#~ msgstr "По _центру"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
-msgstr "скрытая копия"
+#~ msgid "_Justify"
+#~ msgstr "_Выравнивание"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
-msgstr "тело"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Ссылка (Ctrl+L)"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "cc"
-msgstr "копия"
+#~ msgid "C_olor"
+#~ msgstr "_Цвет"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
-msgstr "от"
+#~ msgid "More options"
+#~ msgstr "Дополнительные параметры"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-msgid "subject"
-msgstr "тема"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Цитировать текст (Ctrl+])"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
-msgstr "кому"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Убрать цитирование текста (Ctrl+[)"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
-msgstr "я"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Убрать форматирование (Ctrl+Space)"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-msgid "Drafts | Draft"
-msgstr "Черновики | Drafts | Draft"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Вставить с _форматированием"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "Отправленные | Sent | Sent Mail | Sent Email | Sent E-Mail"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Жирный (Ctrl+B)"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-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"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Курсив (Ctrl+I)"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Корзина | Удалённые | Удаленные | Trash | Rubbish | Rubbish Bin"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Подчёркнутый (Ctrl+U)"
 
-#. List of folder names to match for Archive, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
-msgid "Archive | Archives"
-msgstr "Архив | Архивы | Archive | Archives"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Зачёркнутый (Ctrl+K)"
 
-#. / 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:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%A, %-e %b. %Y в %-l:%M %p"
+#~ msgid "_Rich Text"
+#~ msgstr "Текст с оформлением"
 
-#. / 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:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "В %1$s, %2$s написал:"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Показывать дополнительные поля"
 
-#. / 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:228
-#, c-format
-msgid "%s wrote:"
-msgstr "%s написал:"
+#~ msgctxt "Label"
+#~ msgid "Close and Save"
+#~ msgstr "Сохранить и закрыть"
 
-#. / 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:234
-#, c-format
-msgid "On %s:"
-msgstr "В %s:"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "Сохранить и закрыть"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Пересылаемое сообщение ----------"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "Сохранить и закрыть"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "От: %s\n"
+#~ msgctxt "Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Отказаться и закрыть"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Тема: %s\n"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Отказаться и закрыть"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "Дата: %s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "Отказаться и закрыть"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "Кому: %s\n"
+#~ msgid "Lar_ge"
+#~ msgstr "Круп_ный"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Копия: %s\n"
+#~ msgid "Large"
+#~ msgstr "Крупный"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Невозможно удалить учётную запись</"
-"span> "
+#~ msgid "_Medium"
+#~ msgstr "_Средний"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Открыто окно редактирования писем, связанное с данной учётной записью. "
-"Отправьте письмо или отмените его, затем попробуйте снова."
+#~ msgid "Medium"
+#~ msgstr "Средний"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Добавить учётную запись"
+#~ msgid "_Small"
+#~ msgstr "_Мелкий"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Редактировать учётную запись"
+#~ msgid "Small"
+#~ msgstr "Мелкий"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Удалить учётную запись"
+#~ msgid "S_ans Serif"
+#~ msgstr "_Без засечек"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Подождите пока Geary проверит учётную запись."
+#~ msgid "Sans Serif"
+#~ msgstr "Без засечек"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Недоверенное соединение"
+#~ msgid "S_erif"
+#~ msgstr "_С засечками"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "_Всегда доверять этому серверу"
+#~ msgid "Serif"
+#~ msgstr "С засечками"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "_Доверять этому серверу"
+#~ msgid "_Fixed Width"
+#~ msgstr "_Моноширинный"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "_Не доверять этому серверу"
+#~ msgid "Fixed Width"
+#~ msgstr "Моноширинный"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Отменить"
-
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "В_ернуть"
-
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "_Вырезать"
-
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "В_ставить"
-
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "По _левому краю"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "По _правому краю"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "По _центру"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Выравнивание"
-
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Ссылка (Ctrl+L)"
-
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "_Цвет"
-
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Дополнительные параметры"
-
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Цитировать текст (Ctrl+])"
-
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Убрать цитирование текста (Ctrl+[)"
-
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Убрать форматирование (Ctrl+Space) "
-
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Вставить с _форматированием"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Жирный (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Курсив (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Подчёркнутый (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Зачёркнутый (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "Текст с оформлением"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Показывать дополнительные поля"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "Сохранить и закрыть"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "Сохранить и закрыть"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "Сохранить и закрыть"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "Отказаться и закрыть"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "Отказаться и закрыть"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "Отказаться и закрыть"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "Круп_ный"
-
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "Крупный"
-
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "_Средний"
-
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "Средний"
-
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "_Мелкий"
-
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "Мелкий"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "_Без засечек"
-
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "Без засечек"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "_С засечками"
-
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "С засечками"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "_Моноширинный"
-
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "Моноширинный"
-
-#: ../ui/composer.glade.h:42
-msgid "Detach"
-msgstr "Открепить"
-
-#: ../ui/composer.glade.h:43
-msgid "Detach (Ctrl+D)"
-msgstr "Открепить (Ctrl+D)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_Отправить"
-
-#: ../ui/composer.glade.h:45
-msgid "Send"
-msgstr "Отправить"
-
-#: ../ui/composer.glade.h:46
-msgid "Send (Ctrl+Enter)"
-msgstr "Отправить (Ctrl+Enter)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "_Вложить файл"
-
-#: ../ui/composer.glade.h:48
-msgid "Attach File"
-msgstr "Вложить файл"
-
-#: ../ui/composer.glade.h:49
-msgid "_Include Original Attachments"
-msgstr "_Включить исходные вложения"
-
-#: ../ui/composer.glade.h:50
-msgid "Include Original Attachments"
-msgstr "Включить исходные вложения"
-
-#: ../ui/composer.glade.h:51
-msgid "Application Menu"
-msgstr "Меню приложения"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:53
-msgid "_To"
-msgstr "Кому"
+#~ msgid "Detach"
+#~ msgstr "Открепить"
 
-#: ../ui/composer.glade.h:54
-msgid "_Cc"
-msgstr "Копия"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Открепить (Ctrl+D)"
 
-#: ../ui/composer.glade.h:55
-msgid "_Subject"
-msgstr "Тема"
+#~ msgid "_Send"
+#~ msgstr "_Отправить"
 
-#: ../ui/composer.glade.h:56
-msgid "_Bcc"
-msgstr "Скрытая копия"
+#~ msgid "Send"
+#~ msgstr "Отправить"
 
-#: ../ui/composer.glade.h:57
-msgid "_Reply-To"
-msgstr "_Ответить"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Отправить (Ctrl+Enter)"
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:59
-msgid "From"
-msgstr "От"
+#~ msgid "_Attach File"
+#~ msgstr "_Вложить файл"
 
-#: ../ui/composer.glade.h:60
-msgid "Drop files here"
-msgstr "Перетащите файлы сюда"
+#~ msgid "Attach File"
+#~ msgstr "Вложить файл"
 
-#: ../ui/composer.glade.h:61
-msgid "To add them as attachments"
-msgstr "чтобы добавить их как вложения"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Включить исходные вложения"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-msgid "Remove email address"
-msgstr "Удалить адрес эл. почты"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Включить исходные вложения"
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"Некоторые почтовые сервисы требуют дополнительные адреса, настроенные на "
-"сервере. Обратитесь к поставщику услуг электронной почты для получения "
-"дополнительной информации."
+#~ msgid "Application Menu"
+#~ msgstr "Меню приложения"
 
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "_Обновить"
+#~ msgid "_To"
+#~ msgstr "Кому"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Найти:"
+#~ msgid "_Cc"
+#~ msgstr "Копия"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Предыдущее"
+#~ msgid "_Subject"
+#~ msgstr "Тема"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Следующее"
+#~ msgid "_Bcc"
+#~ msgstr "Скрытая копия"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Учитывать регистр"
+#~ msgid "_Reply-To"
+#~ msgstr "_Ответить"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "метка"
+#~ msgid "From"
+#~ msgstr "От"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Пароль"
+#~ msgid "Drop files here"
+#~ msgstr "Перетащите файлы сюда"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "Адрес _эл. почты"
+#~ msgid "To add them as attachments"
+#~ msgstr "чтобы добавить их как вложения"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Пароль"
+#~ msgid "Remove email address"
+#~ msgstr "Удалить адрес эл. почты"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "_Сервис"
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "Некоторые почтовые сервисы требуют дополнительные адреса, настроенные на "
+#~ "сервере. Обратитесь к поставщику услуг электронной почты для получения "
+#~ "дополнительной информации."
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "_Имя"
+#~ msgid "_Update"
+#~ msgstr "_Обновить"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "_Псевдоним"
+#~ msgid "Find:"
+#~ msgstr "Найти:"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Рабочий, Домашний, и т.д."
+#~ msgid "_Previous"
+#~ msgstr "_Предыдущее"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_Сохранять отправленные"
+#~ msgid "_Next"
+#~ msgstr "_Следующее"
 
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
-msgstr "_Дополнительные адреса эл. почты…"
+#~ msgid "_Case sensitive"
+#~ msgstr "_Учитывать регистр"
 
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "Параметры IMAP"
+#~ msgid "label"
+#~ msgstr "метка"
 
-#: ../ui/login.glade.h:12
-msgid "Se_rver"
-msgstr "Се_рвер"
+#~ msgid "Password"
+#~ msgstr "Пароль"
 
-#: ../ui/login.glade.h:13
-msgid "P_ort"
-msgstr "П_орт"
+#~ msgid "E_mail address"
+#~ msgstr "Адрес _эл. почты"
 
-#: ../ui/login.glade.h:14
-msgid "Ser_ver"
-msgstr "Сер_вер"
+#~ msgid "_Password"
+#~ msgstr "_Пароль"
 
-#: ../ui/login.glade.h:15
-msgid "Por_t"
-msgstr "По_рт"
+#~ msgid "S_ervice"
+#~ msgstr "_Сервис"
 
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "Параметры SMTP"
+#~ msgid "N_ame"
+#~ msgstr "_Имя"
 
-#: ../ui/login.glade.h:17
-msgid "User_name"
-msgstr "Имя _пользователя"
+#~ msgid "N_ickname"
+#~ msgstr "_Псевдоним"
 
-#: ../ui/login.glade.h:18
-msgid "Pass_word"
-msgstr "Пар_оль"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Рабочий, Домашний, и т.д."
 
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr "Имя пользователя SMTP"
+#~ msgid "_Save sent mail"
+#~ msgstr "_Сохранять отправленные"
 
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr "Пароль SMTP"
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "_Дополнительные адреса эл. почты…"
 
-#: ../ui/login.glade.h:21
-msgid "_Username"
-msgstr "_Имя пользователя"
+#~ msgid "IMAP settings"
+#~ msgstr "Параметры IMAP"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr "Имя пользователя IMAP"
+#~ msgid "Se_rver"
+#~ msgstr "Се_рвер"
 
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr "Пароль IMAP"
+#~ msgid "P_ort"
+#~ msgstr "П_орт"
 
-#: ../ui/login.glade.h:24
-msgid "Encr_yption"
-msgstr "Ши_фрование"
+#~ msgid "Ser_ver"
+#~ msgstr "Сер_вер"
 
-#: ../ui/login.glade.h:25
-msgid "Encrypt_ion"
-msgstr "Шиф_рование"
+#~ msgid "Por_t"
+#~ msgstr "По_рт"
 
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "SMTP settings"
+#~ msgstr "Параметры SMTP"
 
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "User_name"
+#~ msgstr "Имя _пользователя"
 
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "Аутентификация не требуется"
+#~ msgid "Pass_word"
+#~ msgstr "Пар_оль"
 
-#: ../ui/login.glade.h:30
-msgid "Use IMAP cre_dentials"
-msgstr "Использовать _учётные данные IMAP"
+#~ msgid "SMTP username"
+#~ msgstr "Имя пользователя SMTP"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Редактирование"
+#~ msgid "SMTP password"
+#~ msgstr "Пароль SMTP"
 
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr "Сохранять черновики на сервере"
+#~ msgid "_Username"
+#~ msgstr "_Имя пользователя"
 
-#: ../ui/login.glade.h:33
-msgid "Si_gn emails (HTML allowed):"
-msgstr "Подписывать письма (доступно HTML):"
+#~ msgid "IMAP username"
+#~ msgstr "Имя пользователя IMAP"
 
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "Хранилище"
+#~ msgid "IMAP password"
+#~ msgstr "Пароль IMAP"
 
-#: ../ui/login.glade.h:35
-msgid "_Download mail"
-msgstr "_Загружать почту"
+#~ msgid "Encr_yption"
+#~ msgstr "Ши_фрование"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "Учётные данные SMTP"
+#~ msgid "Encrypt_ion"
+#~ msgstr "Шиф_рование"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "Имя пользователя"
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Запомнить пароль"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Авторизоваться"
+#~ msgid "No authentication re_quired"
+#~ msgstr "Аутентификация не требуется"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Просмотр"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Использовать _учётные данные IMAP"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "_Автоматически переходить к следующему сообщению"
+#~ msgid "Composer"
+#~ msgstr "Редактирование"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "_Показывать предварительный просмотр сообщений"
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Сохранять черновики на сервере"
 
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr "Использовать _трёхпанельный интерфейс"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "Подписывать письма (доступно HTML):"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "Проверять _орфографию"
+#~ msgid "Storage"
+#~ msgstr "Хранилище"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "Уведомления"
+#~ msgid "_Download mail"
+#~ msgstr "_Загружать почту"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "_Проигрывать звуковые уведомления"
+#~ msgid "SMTP Credentials"
+#~ msgstr "Учётные данные SMTP"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "_Показывать уведомления о новых сообщениях"
+#~ msgid "Username"
+#~ msgstr "Имя пользователя"
 
-#: ../ui/preferences.glade.h:10
-msgid "Always _watch for new mail"
-msgstr "Всегда следить за поступлением новых писем"
+#~ msgid "_Remember password"
+#~ msgstr "_Запомнить пароль"
 
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr ""
-"Geary будет работать в фоновом режиме и сообщать о поступлении новых писем"
+#~ msgid "_Authenticate"
+#~ msgstr "_Авторизоваться"
 
-#: ../ui/preferences.glade.h:12
-msgid "Preferences"
-msgstr "Параметры"
+#~ msgid "Reading"
+#~ msgstr "Просмотр"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Действительно удалить эту учётную "
-"запись?</span> "
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Автоматически переходить к следующему сообщению"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Все письма связанные с данной учётной записью будут удалены с компьютера. "
-"Это не повлияет на электронную почту на сервере."
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Показывать предварительный просмотр сообщений"
+
+#~ msgid "Use _three pane view"
+#~ msgstr "Использовать _трёхпанельный интерфейс"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Проверять _орфографию"
+
+#~ msgid "Notifications"
+#~ msgstr "Уведомления"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Проигрывать звуковые уведомления"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "_Показывать уведомления о новых сообщениях"
+
+#~ msgid "Always _watch for new mail"
+#~ msgstr "Всегда следить за поступлением новых писем"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr ""
+#~ "Geary будет работать в фоновом режиме и сообщать о поступлении новых писем"
+
+#~ msgid "Preferences"
+#~ msgstr "Параметры"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Действительно удалить эту учётную "
+#~ "запись?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Все письма связанные с данной учётной записью будут удалены с компьютера. "
+#~ "Это не повлияет на электронную почту на сервере."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Псевдоним:"
+#~ msgid "Nickname:"
+#~ msgstr "Псевдоним:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Адрес эл. почты:"
+#~ msgid "Email address:"
+#~ msgstr "Адрес эл. почты:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Идёт обновление Geary…"
+#~ msgid "Geary update in progress…"
+#~ msgstr "Идёт обновление Geary…"
diff --git a/po/sk.po b/po/sk.po
index f69266a..caaf594 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,480 +8,449 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-06-30 05:12+0000\n"
-"PO-Revision-Date: 2015-06-30 17:38+0100\n"
-"Last-Translator: Dušan Kazik <prescott66 gmail com>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/geary/language/";
-"sk/)\n"
-"Language: sk\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:10+0000\n"
+"Last-Translator: Dusan Kazik <prescott66 gmail com>\n"
+"Language-Team: Slovak "
+"(http://www.transifex.com/projects/p/geary/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Poedit 1.8.1\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Poštový klient"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary Mail"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Odoslať a prijať poštu"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "email;e-mail;pošta;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Napísať správu"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Odoslať emailom"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Odošle súbory pomocou programu Geary"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Uložiť"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:55+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: sk\n"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Pridať"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Koncepty | Koncept"
 
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "Dodatočné adresy pre %s"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
+"Odoslané správy | Odoslaná poštal | Odoslané emaily | Odoslané E-Maily"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Účty"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr "Nevyžiadaná pošta | Spam | Nevyžiadané emaily"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Meno a priezvisko"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Kôš"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Welcome to Geary."
-msgstr "Vitajte v programe Geary."
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr "Archív | Archívy | Archivované"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Enter your account information to get started."
-msgstr "Zadajte informácie o vašom účte a môžete začať."
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Doručená pošta"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "2 weeks back"
-msgstr "starú 2 týždne"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Koncepty"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "1 month back"
-msgstr "starú 1 mesiac"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Odoslaná pošta"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "3 months back"
-msgstr "starú 3 mesiace"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Označené hviezdičkou"
 
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "6 months back"
-msgstr "starú 6 mesiacov"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Dôležité"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "1 year back"
-msgstr "starú 1 rok"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Všetka pošta"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-msgid "2 years back"
-msgstr "starú 2 roky"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Nevyžiadaná pošta"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-msgid "4 years back"
-msgstr "starú 4 roky"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Kôš"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "Everything"
-msgstr "Všetku"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Pošta na odoslanie"
 
-#: ../src/client/accounts/add-edit-page.vala:280
-msgid "Edit"
-msgstr "Upraví"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Vyhľadať"
 
-#: ../src/client/accounts/add-edit-page.vala:282
-msgid "Preview"
-msgstr "Zobrazí náhľad"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Archív"
 
-#: ../src/client/accounts/add-edit-page.vala:723
-msgid "Remem_ber passwords"
-msgstr "Zapa_mätať heslá"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Nič"
 
-#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "Zapa_mätať heslo"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:764
-msgid "Unable to validate:\n"
-msgstr "Nie je možné overiť:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:766
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Neplatná prezývka účtu.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:769
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; Emailová adresa už je pridaná v programe Geary.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:773
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; Chyba pripojenia k serveru IMAP.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:776
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr ""
-"        &#8226; Používateľské meno alebo heslo servera IMAP je nesprávne.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Iné"
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; Chyba pripojenia k serveru SMTP.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "príloha"
 
-#: ../src/client/accounts/add-edit-page.vala:782
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr ""
-"        &#8226; Používateľské meno alebo heslo servera SMTP je nesprávne.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "skrytá kópia"
 
-#: ../src/client/accounts/add-edit-page.vala:786
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Chyba pripojenia.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "telo"
 
-#: ../src/client/accounts/add-edit-page.vala:790
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Používateľské meno alebo heslo je nesprávne.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "kópia"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Autorské práva 2011-2015 Nadácia Yorba"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "od"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Navštívte webovú stránku organizácie Yorba"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "predmet"
 
-# cmd line desc
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Spustí program Geary so skrytým hlavným oknom"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "pre"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Výstupné ladiace informácie"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "ja"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Zaznamená monitorovanie rozhovorov"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(žiadny predmet)"
 
-# cmd line desc
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Zaznamená deserializáciu siete"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%A, %-e. %B %Y o %H:%M"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Zaznamená aktivitu siete"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "Dňa %1$s, %2$s napísal(a):"
 
-#. / 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 "Zaznamená frontu udalostí servera IMAP"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s napísal/a:"
 
-#. / 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 "Zaznamená serializáciu siete"
+#. / 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:234
+msgid "On %s:"
+msgstr "Dňa %s:"
 
-# cmd line desc
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Periodicky zaznamená aktivitu"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Preposlaná správa ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Zaznamená požiadavky databázy (vygeneruje množstvo správ)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Od: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Zaznamená normalizáciu priečinkov"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Predmet: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Umožní inšpekciu WebView"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Dátum: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Odvolá všetky certifikáty serverov s upozorneniami TLS"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Pre: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Zobrazí verziu programu"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Kópia: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Použite %s na otvorenie nového okna tvorcu správy"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "žiadny"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Prosím, pridajte komentáre, nápady a chyby na:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Poštový klient"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Zlyhalo analyzovanie volieb príkazového riadka: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "Autorské práva 2011-2015 Nadácia Yorba"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Nerozpoznaná voľba príkazového riadku „%s“\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Navštívte webovú stránku organizácie Yorba"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:61
 msgid "Delete conversation"
 msgstr "Odstrániť rozhovor"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Odstráni rozhovor (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Odstráni rozhovory (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:67
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Presunie rozhovory do Koša (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:68
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "Presunie rozhovory do Koša (Delete, Backspace)"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Archivovať"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Archivuje rozhovor (A)"
 
-#: ../src/client/application/geary-controller.vala:75
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Archivuje rozhovory (A)"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Označiť ako nev_yžiadanú poštu"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Označiť ako _vyžiadanú poštu"
 
-#: ../src/client/application/geary-controller.vala:81
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Označí rozhovor"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Označí rozhovory"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Pridá menovku rozhovoru"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Pridá menovku rozhovorom"
 
-#: ../src/client/application/geary-controller.vala:85
-#: ../src/client/application/geary-controller.vala:436
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Presunie rozhovor"
 
-#: ../src/client/application/geary-controller.vala:86
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Presunie rozhovory"
 
-#: ../src/client/application/geary-controller.vala:373
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "Úč_ty"
 
-#: ../src/client/application/geary-controller.vala:378
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "N_astavenia"
 
-#: ../src/client/application/geary-controller.vala:382
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "Po_mocník"
 
-#: ../src/client/application/geary-controller.vala:386
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_O programe"
 
-#: ../src/client/application/geary-controller.vala:390
-msgid "_Donate"
-msgstr "_Prispieť"
-
-#: ../src/client/application/geary-controller.vala:394
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Ukončiť"
 
-#: ../src/client/application/geary-controller.vala:399
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Označiť ako…"
 
-#: ../src/client/application/geary-controller.vala:405
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Označiť ako _prečítanú"
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Označiť ako _neprečítanú"
 
-#: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "Označiť _hviezdičkou"
 
-#: ../src/client/application/geary-controller.vala:422
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "Odz_načiť hviezdičku"
 
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Pridá menovku"
 
-#: ../src/client/application/geary-controller.vala:433
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Menovka"
 
-#: ../src/client/application/geary-controller.vala:437
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Presunúť"
 
-#: ../src/client/application/geary-controller.vala:441
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Vytvorí novú správu (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:445
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Odpovedať"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Odpovie (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:450
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "Odpov_edať všetkým"
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Odpovie všetkým (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Preposlať"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Prepošle (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:496
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr "Vyprázdniť"
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr "Vyprázdni priečinky Nevyžiadaná pošta alebo Kôš"
 
-#: ../src/client/application/geary-controller.vala:501
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr "Vyprázdniť _Nevyžiadanú poštu…"
 
-#: ../src/client/application/geary-controller.vala:505
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr "Vyprázdniť _Kôš…"
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:538
+#: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
 msgstr "Prepne panel vyhľadávania"
 
-#: ../src/client/application/geary-controller.vala:752
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Nie je možné uložiť výnimku dôveryhodnosti servera"
 
-#: ../src/client/application/geary-controller.vala:989
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Vaše nastavenie nie sú bezpečné"
 
-#: ../src/client/application/geary-controller.vala:990
+#: ../src/client/application/geary-controller.vala:984
 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 ""
-"Vaše nastavenia servera IMAP a/alebo SMTP neurčujú šifrovanie SSL alebo "
-"TLS.  To znamená, že vaše meno používateľa a heslo môže byť prečítané inou "
-"osobou v sieti.  Naozaj chcete toto vykonať?"
+"Vaše nastavenia servera IMAP a/alebo SMTP neurčujú šifrovanie SSL alebo TLS. "
+" To znamená, že vaše meno používateľa a heslo môže byť prečítané inou osobou "
+"v sieti.  Naozaj chcete toto vykonať?"
 
-#: ../src/client/application/geary-controller.vala:991
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "Po_kračovať"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Chyba pri odosielaní emailu"
 
-#: ../src/client/application/geary-controller.vala:1070
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -490,14 +459,12 @@ msgstr ""
 "pretrváva, prosím, ručne odstráňte email z vášho priečinka „Pošta na "
 "odoslanie“."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Chyba pri ukladaní odoslanej pošty"
 
-#: ../src/client/application/geary-controller.vala:1075
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -506,20 +473,15 @@ msgstr ""
 "„Odoslaná pošta“. Správa zostane vo vašom priečinku „Pošta na odoslanie“, "
 "pokiaľ ju neodstránite."
 
-#: ../src/client/application/geary-controller.vala:1144
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Menovky"
 
-#. 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:1156
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Nie je možné otvoriť databázu pre %s"
 
-#: ../src/client/application/geary-controller.vala:1157
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -543,21 +505,19 @@ msgstr ""
 "Znovu zostavenie databázy zničí všetku miestnu poštu a jej prílohy. <b>Pošta "
 "na serveri nebude ovplyvnená.</b>"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "_Znovu zostaviť"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "_Ukončiť"
 
-#: ../src/client/application/geary-controller.vala:1168
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Nie je možné znovu zostaviť databázu účtu „%s“"
 
-#: ../src/client/application/geary-controller.vala:1169
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -567,17 +527,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1191
-#: ../src/client/application/geary-controller.vala:1201
-#: ../src/client/application/geary-controller.vala:1212
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Nie je možné otvoriť miestnu poštovú schránku účtu %s"
 
-#: ../src/client/application/geary-controller.vala:1192
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -595,7 +551,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1202
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -608,7 +564,7 @@ msgstr ""
 "touto verziou programu Geary.\n"
 "ynProsím, nainštalujte najnovšiu verziu programu Geary a skúste to znovu."
 
-#: ../src/client/application/geary-controller.vala:1213
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -620,27 +576,29 @@ msgstr ""
 "\n"
 "Prosím, skontrolujte vaše sieťové pripojenie a znovu spustite program Geary."
 
-#: ../src/client/application/geary-controller.vala:1721
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "O %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1724
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
-msgstr "Dušan Kazik <prescott66 gmail com>"
+msgstr ""
+"Dušan Kazik <prescott66 gmail com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Dusan Kazik https://launchpad.net/~prescott66";
 
-#: ../src/client/application/geary-controller.vala:1990
+#: ../src/client/application/geary-controller.vala:1976
 msgid "Undo move (Ctrl+Z)"
 msgstr "Vráti späť presunutie (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2000
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Naozaj chcete otvoriť „%s“?"
 
-#: ../src/client/application/geary-controller.vala:2001
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -648,307 +606,547 @@ msgstr ""
 "Prílohy môžu po otvorení poškodiť váš systém.  Otvárajte iba súbory z "
 "dôveryhodných zdrojov."
 
-#: ../src/client/application/geary-controller.vala:2002
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Nepýtať s_a znovu"
 
-#: ../src/client/application/geary-controller.vala:2020
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Súbor s názvom „%s“ už existuje.  Chcete ho nahradiť?"
 
-#: ../src/client/application/geary-controller.vala:2022
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "Súbor v „%s“ už existuje.  Nahradením sa prepíše jeho obsah."
 
-#: ../src/client/application/geary-controller.vala:2025
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Nahradiť"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2323
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Zavrieť otvorené koncepty správ?"
 
-#: ../src/client/application/geary-controller.vala:2453
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr "Vyprázdniť všetky emaily z vášho priečinka %s?"
 
-#: ../src/client/application/geary-controller.vala:2454
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr ""
 "Týmto sa odstránia všetky emaily z programu Geary a vášho emailového servera."
 
-#: ../src/client/application/geary-controller.vala:2455
+#: ../src/client/application/geary-controller.vala:2441
 msgid "This cannot be undone."
 msgstr "Táto akcia sa nebude dať vrátiť späť."
 
-#: ../src/client/application/geary-controller.vala:2456
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr "Vyprázdniť priečinok %s"
 
-#: ../src/client/application/geary-controller.vala:2473
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 msgid "Error emptying %s"
 msgstr "Chyba pri vyprázdňovaní priečinka %s"
 
-#: ../src/client/application/geary-controller.vala:2503
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
-msgstr[0] "Chcete natrvalo odstrániť túto správu?"
-msgstr[1] "Chcete natrvalo odstrániť tieto správy?"
+msgstr[0] "Chcete natrvalo odstrániť tieto správy?"
+msgstr[1] "Chcete natrvalo odstrániť túto správu?"
 msgstr[2] "Chcete natrvalo odstrániť tieto správy?"
 
-#: ../src/client/application/geary-controller.vala:2505
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: ../src/client/application/geary-controller.vala:2536
+#: ../src/client/application/geary-controller.vala:2522
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Vráti späť archiváciu (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2551
+#: ../src/client/application/geary-controller.vala:2537
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Vráti späť kôš (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2604
+#: ../src/client/application/geary-controller.vala:2590
 msgid "Undo (Ctrl+Z)"
 msgstr "Vráti späť (Ctrl+Z)"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i zhoda"
-msgstr[1] "%i zhody"
-msgstr[2] "%i zhôd"
+# cmd line desc
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Spustí program Geary so skrytým hlavným oknom"
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i zhoda (zalomená)"
-msgstr[1] "%i zhody (zalomené)"
-msgstr[2] "%i zhôd (zalomených)"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Výstupné ladiace informácie"
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "nenájdené"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Zaznamená monitorovanie rozhovorov"
 
-#: ../src/client/components/main-window.vala:430
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+# cmd line desc
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Zaznamená deserializáciu siete"
 
-#: ../src/client/components/search-bar.vala:10
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Vyhľadať"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Zaznamená aktivitu siete"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:25
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Cyhľadá kľúčové slová vo všetkých správach poštového účtu (Ctrl+S)"
+#. / 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 "Zaznamená frontu udalostí servera IMAP"
 
-#: ../src/client/components/search-bar.vala:118
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indexuje sa účet %s"
+#. / 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 "Zaznamená serializáciu siete"
 
-#: ../src/client/components/search-bar.vala:129
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Prehľadať účet %s"
+# cmd line desc
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Periodicky zaznamená aktivitu"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Odosiela sa"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Zaznamená požiadavky databázy (vygeneruje množstvo správ)"
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_OK"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Zaznamená normalizáciu priečinkov"
 
-#: ../src/client/components/stock.vala:19
-#: ../ui/edit_alternate_emails.glade.h:3 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Zrušiť"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Umožní inšpekciu WebView"
 
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Zavrieť"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Odvolá všetky certifikáty serverov s upozorneniami TLS"
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "Za_hodiť"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Zobrazí verziu programu"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Otvoriť"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Použite %s na otvorenie nového okna tvorcu správy"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Tlačiť…"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Prosím, pridajte komentáre, nápady a chyby na:"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "O_dstrániť"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Zlyhalo analyzovanie volieb príkazového riadka: %s\n"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "Vybr_ať všetko"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Nerozpoznaná voľba príkazového riadku „%s“\n"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Ponechať"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Nové správy"
 
-#: ../src/client/composer/composer-widget.vala:73
-msgid "Saved"
-msgstr "Uložené"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d nových správ"
+msgstr[1] "%d nová správa"
+msgstr[2] "%d nové správy"
 
-#: ../src/client/composer/composer-widget.vala:74
-msgid "Saving"
-msgstr "Ukladá sa"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, celkom %d nových správ"
+msgstr[1] "%s, celkom %d nová správa"
+msgstr[2] "%s, celkom %d nové správy"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "Error saving"
-msgstr "Chyba pri ukladaní"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d iných nových správ na účte %s)"
+msgstr[1] ""
+"%s\n"
+"(%d iná nová správa na účte %s)"
+msgstr[2] ""
+"%s\n"
+"(%d iné nové správy na účte %s)"
 
-#: ../src/client/composer/composer-widget.vala:76
-msgid "Press Backspace to delete quote"
-msgstr "Stlačte kláves Backspace na odstránenie citácie"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Otvoriť"
 
-#: ../src/client/composer/composer-widget.vala:77
-msgid "New Message"
-msgstr "Nová správa"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Ja"
 
-#. A 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:138
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr "Nedôveryhodné pripojenie: %s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr "Identitu poštového servera %s na adrese %s:%u sa nepodarilo overiť."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
 msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
-"príloha|prílohy|priložiť|priložený|priložená|priložené|priloženému|"
-"priloženým|priložených|priloženého|prikladám|prikladanú|prikladané|"
-"prikladaný|prikladaným|prikladanému"
+"Vybratie voľby „Dôverovať tomuto serveru“ alebo „Vždy dôverovať tomuto "
+"serveru“ môže spôsobiť, že prenos vášho používateľského mena a hesla nebude "
+"zabezpečený."
 
-#: ../src/client/composer/composer-widget.vala:1102
-#: ../src/client/composer/composer-widget.vala:1106
-msgid "Do you want to discard this message?"
-msgstr "Chcete zahodiť túto správu?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"Vybratie voľby „Nedôverovať tomuto serveru“ spôsobí, že program Geary nebude "
+"pristupovať k tomuto serveru."
 
-#: ../src/client/composer/composer-widget.vala:1262
-msgid "Send message with an empty subject and body?"
-msgstr "Odoslať správu bez predmetu a s prázdnym telom?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Program Geary nepridá alebo neaktualizuje tento emailový účet."
 
-#: ../src/client/composer/composer-widget.vala:1264
-msgid "Send message with an empty subject?"
-msgstr "Odoslať správu bez predmetu?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"Vybratie voľby „Nedôverovať tomuto serveru“ spôsobí, že program Geary "
+"prestane pristupovať k tomuto účtu."
 
-#: ../src/client/composer/composer-widget.vala:1266
-msgid "Send message with an empty body?"
-msgstr "Odoslať správu s prázdnym telom?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr "Program Geary skončí, ak nemáte otvorené žiadne iné emailové účty."
 
-#: ../src/client/composer/composer-widget.vala:1268
-msgid "Send message without an attachment?"
-msgstr "Odoslať správu bez prílohy?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Ak máte akékoľvek otázky k tomuto problému, obráťte sa na vášho správcu "
+"systému, alebo poskytovateľa emailovej služby."
 
-#: ../src/client/composer/composer-widget.vala:1530
-msgid "Cannot add attachment"
-msgstr "Nedá sa pridať príloha"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr "Certifikát servera nie je podpísaný známou autoritou"
 
-#: ../src/client/composer/composer-widget.vala:1541
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "„%s“ sa nepodarilo nájsť."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr "Identita servera sa nezhoduje s identitou uvedenou v certifikáte"
 
-#: ../src/client/composer/composer-widget.vala:1548
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "„%s“ je priečinok."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Platnosť certifikátu servera skončila"
 
-#: ../src/client/composer/composer-widget.vala:1555
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "„%s“ je prázdny súbor."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "Certifikát servera nebol aktivovaný"
 
-#: ../src/client/composer/composer-widget.vala:1569
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "„%s“ sa nepodarilo otvoriť na čítanie."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "Certifikát servera bol odvolaný a teraz je neplatný"
 
-#: ../src/client/composer/composer-widget.vala:1576
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "„%s“ je už priložený na doručenie."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "Certifikát servera je považovaný za nebezpečný"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1585
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr "Vyskytla sa chyba počas spracovávania certifikátu servera"
 
-#: ../src/client/composer/composer-widget.vala:1645
-msgid "To: "
-msgstr "Pre: "
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr "Program Geary vyžaduje pre pokračovanie heslo k vášmu emailu"
 
-#: ../src/client/composer/composer-widget.vala:1648
-msgid "Cc: "
-msgstr "Kópia: "
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Zvoľte súbor"
 
-#: ../src/client/composer/composer-widget.vala:1651
-msgid "Bcc: "
-msgstr "Skrytá kópia: "
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Priložiť"
 
-#: ../src/client/composer/composer-widget.vala:1654
-msgid "Reply-To: "
-msgstr "Komu odpovedať: "
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr "Dodatočné adresy pre %s"
 
-#: ../src/client/composer/composer-widget.vala:1887
-msgid "Select Color"
-msgstr "Výber farby"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Účty"
 
-#. 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:2322
-#, c-format
-msgid "%1$s via %2$s"
-msgstr "%1$s prostredníctvom účtu %2$s"
+#. / 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 "Meno a priezvisko"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2364
-msgid "_From:"
-msgstr "Od:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Vitajte v programe Geary."
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Ja"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Zadajte informácie o vašom účte a môžete začať."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "starú 2 týždne"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "starú 1 mesiac"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "starú 3 mesiace"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "starú 6 mesiacov"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "starú 1 rok"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "starú 2 roky"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "starú 4 roky"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Všetku"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "Upraví"
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr "Zobrazí náhľad"
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "Zapa_mätať heslá"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "Zapa_mätať heslo"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Nie je možné overiť:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Neplatná prezývka účtu.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Emailová adresa už je pridaná v programe Geary.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Chyba pripojenia k serveru IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr ""
+"        &#8226; Používateľské meno alebo heslo servera IMAP je nesprávne.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Chyba pripojenia k serveru SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr ""
+"        &#8226; Používateľské meno alebo heslo servera SMTP je nesprávne.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Chyba pripojenia.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Používateľské meno alebo heslo je nesprávne.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Uložiť"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Pridať"
+
+#. / 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 "%H:%M"
+
+#. / 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 "%H:%M, %e. %B, %Y"
+
+#. / 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 "%H:%M, %e. %B, %Y"
+
+#. / 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 "%H:%M, %e. %B, %Y"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Teraz"
+
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "Pred %dm"
+msgstr[1] "Pred %dm"
+msgstr[2] "Pred %dm"
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "Pred %dh"
+msgstr[1] "Pred %dh"
+msgstr[2] "Pred %dh"
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Včera"
+
+#. / 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
+msgid "%A"
+msgstr "%A"
+
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "bajtov"
+
+#: ../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/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d správ"
+msgstr[1] "%d správa"
+msgstr[2] "%d správy"
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d neprečítaných"
+msgstr[1] "%d neprečítaná"
+msgstr[2] "%d neprečítané"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Priečinky s doručenou poštou"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Prehľadať účet %s"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d výsledkov"
+msgstr[1] "%d výsledok"
+msgstr[2] "%d výsledky"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "Žiadne vybraté rozhovory."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
-msgstr[0] "%u vybratý rozhovor."
-msgstr[1] "%u vybraté rozhovory."
-msgstr[2] "%u vybratých rozhovorov."
+msgstr[0] "%u vybratých rozhovorov."
+msgstr[1] "%u vybratý rozhovor."
+msgstr[2] "%u vybraté rozhovory."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:444
 msgid "No search results found."
@@ -999,43 +1197,39 @@ msgid "Date:"
 msgstr "Dátum:"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
-msgstr[0] "%u prečítaná správa"
-msgstr[1] "%u prečítané správy"
-msgstr[2] "%u prečítaných správ"
+msgstr[0] "%u prečítaných správ"
+msgstr[1] "%u prečítaná správa"
+msgstr[2] "%u prečítané správy"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr ""
 "Táto správa bola úspešne odoslaná, ale nepodarilo sa ju uložiť do priečinka "
 "%s."
 
-#. Add a menu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Skopírovať"
 
-#. Add a menu item for copying the address.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "Skopírovať _emailovú adresu"
 
-#. Add a menu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Skopírovať _odkaz"
 
-#. Select message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "Vybrať _správu"
 
-#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Vybr_ať všetko"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "_Preskúmať"
@@ -1048,7 +1242,6 @@ msgstr "Zdá sa, že tento odkaz odkazuje na"
 msgid "but actually goes to"
 msgstr "ale v skutočnosti odkazuje na"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
 msgstr " (Neplatný?)"
@@ -1068,16 +1261,14 @@ msgstr "Uložiť všetky p_rílohy…"
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1847
 msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
-msgstr[0] "Uložiť p_rílohu…"
-msgstr[1] "Uložiť všetky p_rílohy…"
+msgstr[0] "Uložiť všetky p_rílohy…"
+msgstr[1] "Uložiť p_rílohu…"
 msgstr[2] "Uložiť všetky p_rílohy…"
 
-#. Reply to all on a message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "Odpoved_ať všetkým"
 
-#. Mark as read/unread.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "_Označiť ako prečítanú"
@@ -1090,1083 +1281,632 @@ msgstr "_Označiť ako neprečítanú"
 msgid "Mark Unread From _Here"
 msgstr "Označiť ako neprečítané _odtiaľto"
 
-#. Separator.
-#. View original message source.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "Zobraziť z_droj"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:378
-msgid "none"
-msgstr "žiadny"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "Zlyhalo otvorenie predvoleného textového editora."
 
 #: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s - Inšpektor rozhovorov"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Zvoľte súbor"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Uložené"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Priložiť"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Ukladá sa"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
-msgid "Untrusted Connection: %s"
-msgstr "Nedôveryhodné pripojenie: %s"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Chyba pri ukladaní"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
-msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr "Identitu poštového servera %s na adrese %s:%u sa nepodarilo overiť."
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "Stlačte kláves Backspace na odstránenie citácie"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
-msgid ""
-"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-"your username and password to be transmitted insecurely."
-msgstr ""
-"Vybratie voľby „Dôverovať tomuto serveru“ alebo „Vždy dôverovať tomuto "
-"serveru“ môže spôsobiť, že prenos vášho používateľského mena a hesla nebude "
-"zabezpečený."
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Nová správa"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-"server."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Vybratie voľby „Nedôverovať tomuto serveru“ spôsobí, že program Geary nebude "
-"pristupovať k tomuto serveru."
+"príloha|prílohy|priložiť|priložený|priložená|priložené|priloženému|priloženým"
+"|priložených|priloženého|prikladám|prikladanú|prikladané|prikladaný|prikladan"
+"ým|prikladanému"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
-msgid "Geary will not add or update this email account."
-msgstr "Program Geary nepridá alebo neaktualizuje tento emailový účet."
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Chcete zahodiť túto správu?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-"this account."
-msgstr ""
-"Vybratie voľby „Nedôverovať tomuto serveru“ spôsobí, že program Geary "
-"prestane pristupovať k tomuto účtu."
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Odoslať správu bez predmetu a s prázdnym telom?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr "Program Geary skončí, ak nemáte otvorené žiadne iné emailové účty."
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Odoslať správu bez predmetu?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
-msgid ""
-"Contact your system administrator or email service provider if you have any "
-"question about these issues."
-msgstr ""
-"Ak máte akékoľvek otázky k tomuto problému, obráťte sa na vášho správcu "
-"systému, alebo poskytovateľa emailovej služby."
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Odoslať správu s prázdnym telom?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
-msgstr "Certifikát servera nie je podpísaný známou autoritou"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Odoslať správu bez prílohy?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
-msgid "The server's identity does not match the identity in the certificate"
-msgstr "Identita servera sa nezhoduje s identitou uvedenou v certifikáte"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Nedá sa pridať príloha"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
-msgid "The server's certificate has expired"
-msgstr "Platnosť certifikátu servera skončila"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "„%s“ sa nepodarilo nájsť."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
-msgid "The server's certificate has not been activated"
-msgstr "Certifikát servera nebol aktivovaný"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "„%s“ je priečinok."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
-msgid "The server's certificate has been revoked and is now invalid"
-msgstr "Certifikát servera bol odvolaný a teraz je neplatný"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "„%s“ je prázdny súbor."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
-msgid "The server's certificate is considered insecure"
-msgstr "Certifikát servera je považovaný za nebezpečný"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "„%s“ sa nepodarilo otvoriť na čítanie."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
-msgid "An error has occurred processing the server's certificate"
-msgstr "Vyskytla sa chyba počas spracovávania certifikátu servera"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "„%s“ je už priložený na doručenie."
 
-#. 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 "Geary requires your email password to continue"
-msgstr "Program Geary vyžaduje pre pokračovanie heslo k vášmu emailu"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. 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 správa"
-msgstr[1] "%d správy"
-msgstr[2] "%d správ"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Pre: "
 
-#. / 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 neprečítaná"
-msgstr[1] "%d neprečítané"
-msgstr[2] "%d neprečítaných"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Kópia: "
 
-#. / 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/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Skrytá kópia: "
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Priečinky s doručenou poštou"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "Komu odpovedať: "
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d výsledok"
-msgstr[1] "%d výsledky"
-msgstr[2] "%d výsledkov"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Výber farby"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Nové správy"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr "%1$s prostredníctvom účtu %2$s"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d nová správa"
-msgstr[1] "%d nové správy"
-msgstr[2] "%d nových správ"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "Od:"
 
-#: ../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] "%s, celkom %d nová správa"
-msgstr[1] "%s, celkom %d nové správy"
-msgstr[2] "%s, celkom %d nových správ"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 iná nová správa na účte %s)"
-msgstr[1] ""
-"%s\n"
-"(%d iné nové správy na účte %s)"
-msgstr[2] ""
-"%s\n"
-"(%d iných nových správ na účte %s)"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Odosiela sa"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Otvoriť"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i zhôd"
+msgstr[1] "%i zhoda"
+msgstr[2] "%i zhody"
 
-#. / 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 "%H:%M"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i zhôd (zalomených)"
+msgstr[1] "%i zhoda (zalomená)"
+msgstr[2] "%i zhody (zalomené)"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "nenájdené"
 
-#. / 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"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_OK"
 
-#. / 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"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Zrušiť"
 
-#. / 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"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Zavrieť"
 
-#. / 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 "%H:%M, %e. %B, %Y"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "Za_hodiť"
 
-#. / 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 "%H:%M, %e. %B, %Y"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Otvoriť"
 
-#. / 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 "%H:%M, %e. %B, %Y"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Tlačiť…"
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Teraz"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "O_dstrániť"
 
-#: ../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "Pred %dm"
-msgstr[1] "Pred %dm"
-msgstr[2] "Pred %dm"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Ponechať"
 
-#: ../src/client/util/util-date.vala:171
-#, c-format
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "Pred %dh"
-msgstr[1] "Pred %dh"
-msgstr[2] "Pred %dh"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Cyhľadá kľúčové slová vo všetkých správach poštového účtu (Ctrl+S)"
 
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "Včera"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Indexuje sa účet %s"
 
-#. / 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"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(žiadny predmet)"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary Mail"
 
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "bajtov"
+#~ msgid "Send and receive email"
+#~ msgstr "Odoslať a prijať poštu"
 
-#: ../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "email;e-mail;pošta;"
 
-#: ../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#~ msgid "Compose Message"
+#~ msgstr "Napísať správu"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#~ msgid "Send by email"
+#~ msgstr "Odoslať emailom"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#~ msgid "Send files using Geary"
+#~ msgstr "Odošle súbory pomocou programu Geary"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#~ msgid "_Donate"
+#~ msgstr "_Prispieť"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Nedá sa odstrániť účet</span> "
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Okno tvorcu správy priradeného k tomuto účtu je momentálne otvorené. "
+#~ "Odošlite alebo zahoďte správu a skúste to znovu."
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Iné"
+#~ msgid "Add account"
+#~ msgstr "Pridá účet"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#~ msgid "Edit account"
+#~ msgstr "Upraví účet"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#~ msgid "Remove account"
+#~ msgstr "Odstráni účet"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Doručená pošta"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Prosím, čakajte, kým program Geary overí váš účet."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Koncepty"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Nedôveryhodné pripojenie"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Odoslaná pošta"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "_Vždy dôverovať tomuto serveru"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Označené hviezdičkou"
+#~ msgid "_Trust This Server"
+#~ msgstr "_Dôverovať tomuto serveru"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Dôležité"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "_Nedôverovať tomuto serveru"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Všetka pošta"
+#~ msgid "_Undo"
+#~ msgstr "Vrátiť _späť"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Nevyžiadaná pošta"
+#~ msgid "_Redo"
+#~ msgstr "_Znovu vykonať"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Kôš"
+#~ msgid "Cu_t"
+#~ msgstr "Vys_trihnúť"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Pošta na odoslanie"
+#~ msgid "_Paste"
+#~ msgstr "_Vložiť"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Archív"
+#~ msgid "_Left"
+#~ msgstr "_Vľavo"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-msgstr "Nič"
+#~ msgid "_Right"
+#~ msgstr "Vp_ravo"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-msgid "attachment"
-msgstr "príloha"
+#~ msgid "_Center"
+#~ msgstr "Na _stred"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
-msgstr "skrytá kópia"
+#~ msgid "_Justify"
+#~ msgstr "_Zarovnať"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
-msgstr "telo"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Vytvorí odkaz (Ctrl+L)"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "cc"
-msgstr "kópia"
+#~ msgid "C_olor"
+#~ msgstr "_Farba"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
-msgstr "od"
+#~ msgid "More options"
+#~ msgstr "Viac volieb"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-msgid "subject"
-msgstr "predmet"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Cituje text (Ctrl+])"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
-msgstr "pre"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Zruší citáciu textu (Ctrl+[)"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
-msgstr "ja"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Odstráni formátovanie (Ctrl+Space)"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-msgid "Drafts | Draft"
-msgstr "Koncepty | Koncept"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Vložiť s _formátovaním"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "Odoslané správy | Odoslaná poštal | Odoslané emaily | Odoslané E-Maily"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Tučné (Ctrl+B)"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
-msgstr "Nevyžiadaná pošta | Spam | Nevyžiadané emaily"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Kurzíva (Ctrl+I)"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Kôš"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Podčiarknuté (Ctrl+U)"
 
-#. List of folder names to match for Archive, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
-msgid "Archive | Archives"
-msgstr "Archív | Archívy | Archivované"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Preškrtnuté (Ctrl+K)"
 
-#. / 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:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%A, %-e. %B %Y o %H:%M"
+#~ msgid "_Rich Text"
+#~ msgstr "_Formátovaný text"
 
-#. / 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:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "Dňa %1$s, %2$s napísal(a):"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Zobrazí rozšírené polia"
 
-#. / 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:228
-#, c-format
-msgid "%s wrote:"
-msgstr "%s napísal/a:"
+#~ msgctxt "Label"
+#~ msgid "Close and Save"
+#~ msgstr "Zavrieť a uložiť"
 
-#. / 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:234
-#, c-format
-msgid "On %s:"
-msgstr "Dňa %s:"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "Zavrieť a uložiť"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Preposlaná správa ----------"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "Zavrie a uloží"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "Od: %s\n"
+#~ msgctxt "Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Zavrieť a zahodiť"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Predmet: %s\n"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Zavrieť a zahodiť"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "Dátum: %s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "Zavrie a zahodí"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "Pre: %s\n"
+#~ msgid "Lar_ge"
+#~ msgstr "_Veľké"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Kópia: %s\n"
+#~ msgid "Large"
+#~ msgstr "Veľké"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">Nedá sa odstrániť účet</span> "
+#~ msgid "_Medium"
+#~ msgstr "_Stredné"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Okno tvorcu správy priradeného k tomuto účtu je momentálne otvorené. "
-"Odošlite alebo zahoďte správu a skúste to znovu."
+#~ msgid "Medium"
+#~ msgstr "Stredné"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Pridá účet"
+#~ msgid "_Small"
+#~ msgstr "_Malé"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Upraví účet"
+#~ msgid "Small"
+#~ msgstr "Malé"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Odstráni účet"
+#~ msgid "S_ans Serif"
+#~ msgstr "S_ans Serif"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Prosím, čakajte, kým program Geary overí váš účet."
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Nedôveryhodné pripojenie"
+#~ msgid "S_erif"
+#~ msgstr "S_erif"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "_Vždy dôverovať tomuto serveru"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "_Dôverovať tomuto serveru"
+#~ msgid "_Fixed Width"
+#~ msgstr "_Pevná šírka"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "_Nedôverovať tomuto serveru"
+#~ msgid "Fixed Width"
+#~ msgstr "Pevná šírka"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "Vrátiť _späť"
-
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Znovu vykonať"
-
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "Vys_trihnúť"
-
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "_Vložiť"
-
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Vľavo"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "Vp_ravo"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "Na _stred"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Zarovnať"
-
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Vytvorí odkaz (Ctrl+L)"
-
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "_Farba"
-
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Viac volieb"
-
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Cituje text (Ctrl+])"
-
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Zruší citáciu textu (Ctrl+[)"
-
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Odstráni formátovanie (Ctrl+Space)"
-
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Vložiť s _formátovaním"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Tučné (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Kurzíva (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Podčiarknuté (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Preškrtnuté (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "_Formátovaný text"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Zobrazí rozšírené polia"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "Zavrieť a uložiť"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "Zavrieť a uložiť"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "Zavrie a uloží"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "Zavrieť a zahodiť"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "Zavrieť a zahodiť"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "Zavrie a zahodí"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "_Veľké"
-
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "Veľké"
-
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "_Stredné"
-
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "Stredné"
-
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "_Malé"
-
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "Malé"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
-
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "S_erif"
-
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "Serif"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "_Pevná šírka"
-
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "Pevná šírka"
-
-#: ../ui/composer.glade.h:42
-msgid "Detach"
-msgstr "Odpojí"
-
-#: ../ui/composer.glade.h:43
-msgid "Detach (Ctrl+D)"
-msgstr "Odpojí (Ctrl+D)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_Odoslať"
-
-#: ../ui/composer.glade.h:45
-msgid "Send"
-msgstr "Odoslať"
-
-#: ../ui/composer.glade.h:46
-msgid "Send (Ctrl+Enter)"
-msgstr "Odošle (Ctrl+Enter)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "_Priložiť súbor"
-
-#: ../ui/composer.glade.h:48
-msgid "Attach File"
-msgstr "Priloží súbor"
-
-#: ../ui/composer.glade.h:49
-msgid "_Include Original Attachments"
-msgstr "Zahrnúť _pôvodné prílohy"
-
-#: ../ui/composer.glade.h:50
-msgid "Include Original Attachments"
-msgstr "zahrnie pôvodné prílohy"
-
-#: ../ui/composer.glade.h:51
-msgid "Application Menu"
-msgstr "Ponuka aplikácie"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:53
-msgid "_To"
-msgstr "_Pre"
+#~ msgid "Detach"
+#~ msgstr "Odpojí"
 
-#: ../ui/composer.glade.h:54
-msgid "_Cc"
-msgstr "_Kópia"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Odpojí (Ctrl+D)"
 
-#: ../ui/composer.glade.h:55
-msgid "_Subject"
-msgstr "P_redmet"
+#~ msgid "_Send"
+#~ msgstr "_Odoslať"
 
-#: ../ui/composer.glade.h:56
-msgid "_Bcc"
-msgstr "_Skrytá kópia"
+#~ msgid "Send"
+#~ msgstr "Odoslať"
 
-#: ../ui/composer.glade.h:57
-msgid "_Reply-To"
-msgstr "_Komu odpovedať"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Odošle (Ctrl+Enter)"
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:59
-msgid "From"
-msgstr "Od"
+#~ msgid "_Attach File"
+#~ msgstr "_Priložiť súbor"
 
-#: ../ui/composer.glade.h:60
-msgid "Drop files here"
-msgstr "Sem pustite súbory"
+#~ msgid "Attach File"
+#~ msgstr "Priloží súbor"
 
-#: ../ui/composer.glade.h:61
-msgid "To add them as attachments"
-msgstr "Na ich pridanie do prílohy"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "Zahrnúť _pôvodné prílohy"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-msgid "Remove email address"
-msgstr "Odstráni emailové adresy"
+#~ msgid "Include Original Attachments"
+#~ msgstr "zahrnie pôvodné prílohy"
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"Niektoré emailové služby vyžadujú nastavenie dodatočných adries na serveri. "
-"Pre viac informácií kontaktuje vášho poskytovateľa emailovej služby."
+#~ msgid "Application Menu"
+#~ msgstr "Ponuka aplikácie"
 
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "_Aktualizovať"
+#~ msgid "_To"
+#~ msgstr "_Pre"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Nájsť:"
+#~ msgid "_Cc"
+#~ msgstr "_Kópia"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Predchádzajúca"
+#~ msgid "_Subject"
+#~ msgstr "P_redmet"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Nasledujúca"
+#~ msgid "_Bcc"
+#~ msgstr "_Skrytá kópia"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Rozlišovať veľkosť písmen"
+#~ msgid "_Reply-To"
+#~ msgstr "_Komu odpovedať"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "menovka"
+#~ msgid "From"
+#~ msgstr "Od"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Heslo"
+#~ msgid "Drop files here"
+#~ msgstr "Sem pustite súbory"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "E_mailová adresa"
+#~ msgid "To add them as attachments"
+#~ msgstr "Na ich pridanie do prílohy"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Heslo"
+#~ msgid "Remove email address"
+#~ msgstr "Odstráni emailové adresy"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "S_lužba"
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "Niektoré emailové služby vyžadujú nastavenie dodatočných adries na serveri. "
+#~ "Pre viac informácií kontaktuje vášho poskytovateľa emailovej služby."
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "_Meno"
+#~ msgid "_Update"
+#~ msgstr "_Aktualizovať"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "Pre_zývka"
+#~ msgid "Find:"
+#~ msgstr "Nájsť:"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Práca, domov, atď."
+#~ msgid "_Previous"
+#~ msgstr "_Predchádzajúca"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_Uložiť odoslanú poštu"
+#~ msgid "_Next"
+#~ msgstr "_Nasledujúca"
 
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
-msgstr "Doda_točné emailové adresy…"
+#~ msgid "_Case sensitive"
+#~ msgstr "_Rozlišovať veľkosť písmen"
 
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "Nastavenia IMAP"
+#~ msgid "label"
+#~ msgstr "menovka"
 
-#: ../ui/login.glade.h:12
-msgid "Se_rver"
-msgstr "Se_rver"
+#~ msgid "Password"
+#~ msgstr "Heslo"
 
-#: ../ui/login.glade.h:13
-msgid "P_ort"
-msgstr "P_ort"
+#~ msgid "E_mail address"
+#~ msgstr "E_mailová adresa"
 
-#: ../ui/login.glade.h:14
-msgid "Ser_ver"
-msgstr "Ser_ver"
+#~ msgid "_Password"
+#~ msgstr "_Heslo"
 
-#: ../ui/login.glade.h:15
-msgid "Por_t"
-msgstr "Por_t"
+#~ msgid "S_ervice"
+#~ msgstr "S_lužba"
 
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "Nastavenia SMTP"
+#~ msgid "N_ame"
+#~ msgstr "_Meno"
 
-#: ../ui/login.glade.h:17
-msgid "User_name"
-msgstr "Používateľské _meno"
+#~ msgid "N_ickname"
+#~ msgstr "Pre_zývka"
 
-#: ../ui/login.glade.h:18
-msgid "Pass_word"
-msgstr "He_slo"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Práca, domov, atď."
 
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr "Používateľské meno pre SMTP"
+#~ msgid "_Save sent mail"
+#~ msgstr "_Uložiť odoslanú poštu"
 
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr "Heslo pre SMTP"
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "Doda_točné emailové adresy…"
 
-#: ../ui/login.glade.h:21
-msgid "_Username"
-msgstr "_Používateľské meno"
+#~ msgid "IMAP settings"
+#~ msgstr "Nastavenia IMAP"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr "Používateľské meno pre IMAP"
+#~ msgid "Se_rver"
+#~ msgstr "Se_rver"
 
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr "Heslo pre IMAP"
+#~ msgid "P_ort"
+#~ msgstr "P_ort"
 
-#: ../ui/login.glade.h:24
-msgid "Encr_yption"
-msgstr "Š_ifrovanie"
+#~ msgid "Ser_ver"
+#~ msgstr "Ser_ver"
 
-#: ../ui/login.glade.h:25
-msgid "Encrypt_ion"
-msgstr "Ši_frovanie"
+#~ msgid "Por_t"
+#~ msgstr "Por_t"
 
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "SMTP settings"
+#~ msgstr "Nastavenia SMTP"
 
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "User_name"
+#~ msgstr "Používateľské _meno"
 
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "Ne_požaduje sa overenie totožnosti"
+#~ msgid "Pass_word"
+#~ msgstr "He_slo"
 
-#: ../ui/login.glade.h:30
-msgid "Use IMAP cre_dentials"
-msgstr "Použiť p_overenia pre IMAP"
+#~ msgid "SMTP username"
+#~ msgstr "Používateľské meno pre SMTP"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Tvorca správy"
+#~ msgid "SMTP password"
+#~ msgstr "Heslo pre SMTP"
 
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr "Uložiť _koncepty na serveri"
+#~ msgid "_Username"
+#~ msgstr "_Používateľské meno"
 
-#: ../ui/login.glade.h:33
-msgid "Si_gn emails (HTML allowed):"
-msgstr "_Podpísať emaily (s povoleným HTML):"
+#~ msgid "IMAP username"
+#~ msgstr "Používateľské meno pre IMAP"
 
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "Úložisko"
+#~ msgid "IMAP password"
+#~ msgstr "Heslo pre IMAP"
 
-#: ../ui/login.glade.h:35
-msgid "_Download mail"
-msgstr "_Prevziať poštu"
+#~ msgid "Encr_yption"
+#~ msgstr "Š_ifrovanie"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "Poverenia pre SMTP"
+#~ msgid "Encrypt_ion"
+#~ msgstr "Ši_frovanie"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "Používateľské meno"
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Zapamätať heslo"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Overiť totožnosť"
+#~ msgid "No authentication re_quired"
+#~ msgstr "Ne_požaduje sa overenie totožnosti"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Čítanie"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Použiť p_overenia pre IMAP"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "_Automaticky vybrať ďalšiu správu"
+#~ msgid "Composer"
+#~ msgstr "Tvorca správy"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "_Zobraziť náhľad rozhovoru"
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Uložiť _koncepty na serveri"
 
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr "Použiť zobrazenie s _troma panelmi"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "_Podpísať emaily (s povoleným HTML):"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "Povoliť _kontrolu pravopisu"
+#~ msgid "Storage"
+#~ msgstr "Úložisko"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "Oznámenia"
+#~ msgid "_Download mail"
+#~ msgstr "_Prevziať poštu"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "_Prehrať zvuky upozornení"
+#~ msgid "SMTP Credentials"
+#~ msgstr "Poverenia pre SMTP"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "Zobraziť _upozornenia pre novú poštu"
+#~ msgid "Username"
+#~ msgstr "Používateľské meno"
 
-#: ../ui/preferences.glade.h:10
-msgid "Always _watch for new mail"
-msgstr "Vždy _sledovať novú poštu"
+#~ msgid "_Remember password"
+#~ msgstr "_Zapamätať heslo"
 
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr "Program Geary bude spustený na pozadí a bude upozorňovať na novú poštu"
+#~ msgid "_Authenticate"
+#~ msgstr "_Overiť totožnosť"
 
-#: ../ui/preferences.glade.h:12
-msgid "Preferences"
-msgstr "Nastavenia"
+#~ msgid "Reading"
+#~ msgstr "Čítanie"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Naozaj chcete odstrániť tento účet?</"
-"span> "
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Automaticky vybrať ďalšiu správu"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Všetky emaily priradené k tomuto účtu budú odstránené z vášho počítača. "
-"Emaily na serveri nebudú ovplyvnené."
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Zobraziť náhľad rozhovoru"
+
+#~ msgid "Use _three pane view"
+#~ msgstr "Použiť zobrazenie s _troma panelmi"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Povoliť _kontrolu pravopisu"
+
+#~ msgid "Notifications"
+#~ msgstr "Oznámenia"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Prehrať zvuky upozornení"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Zobraziť _upozornenia pre novú poštu"
+
+#~ msgid "Always _watch for new mail"
+#~ msgstr "Vždy _sledovať novú poštu"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr ""
+#~ "Program Geary bude spustený na pozadí a bude upozorňovať na novú poštu"
+
+#~ msgid "Preferences"
+#~ msgstr "Nastavenia"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Naozaj chcete odstrániť tento "
+#~ "účet?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Všetky emaily priradené k tomuto účtu budú odstránené z vášho počítača. "
+#~ "Emaily na serveri nebudú ovplyvnené."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Prezývka:"
+#~ msgid "Nickname:"
+#~ msgstr "Prezývka:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Emailová adresa:"
+#~ msgid "Email address:"
+#~ msgstr "Emailová adresa:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Prebieha aktualizácia programu Geary…"
+#~ msgid "Geary update in progress…"
+#~ msgstr "Prebieha aktualizácia programu Geary…"
 
 #~ msgid "No conversations selected"
 #~ msgstr "Žiadne vybrané rozhovory"
 
 #~ msgid "%u conversation selected"
 #~ msgid_plural "%u conversations selected"
-#~ msgstr[0] "%u vybraný rozhovor"
-#~ msgstr[1] "%u vybrané rozhovory"
-#~ msgstr[2] "%u vybraných rozhovorov"
+#~ msgstr[0] "%u vybraných rozhovorov"
+#~ msgstr[1] "%u vybraný rozhovor"
+#~ msgstr[2] "%u vybrané rozhovory"
 
 #~ msgid "Password:"
 #~ msgstr "Heslo:"
diff --git a/po/sl.po b/po/sl.po
index 01e8bb9..32837f9 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,420 +8,429 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-02-27 20:29+0000\n"
-"PO-Revision-Date: 2014-03-22 08:45+0100\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:11+0000\n"
 "Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
-"Language: sl_SI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
-"%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
+"n%100==4 ? 3 : 0);\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:55+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: sl_SI\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.5.4\n"
 
-#: ../desktop/geary.desktop.in.h:1
-#| msgid "Geary Mail"
-msgid "Geary"
-msgstr "Geary"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr ""
 
-#: ../desktop/geary.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Poštni klient"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
 
-#: ../desktop/geary.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary Mail"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
 
-#: ../desktop/geary.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Pošlji in prejmi epošto"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr ""
 
-#: ../desktop/geary.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Epošta;E-pošta;Pošta;"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Sestavi sporočilo"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Prejeto"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Shrani"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Osnutki"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Dodaj"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Poslano"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:19
-msgid "Accounts"
-msgstr "Računi"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Z zvezdico"
 
-#. Copyright 2011-2014 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Ime Priimek"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Pomembno"
 
-#: ../src/client/accounts/add-edit-page.vala:202
-msgid "Welcome to Geary."
-msgstr "Dobrodošli v Geary."
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Vsa pošta"
 
-#: ../src/client/accounts/add-edit-page.vala:202
-msgid "Enter your account information to get started."
-msgstr "Vpišite podatke o svojem računu, da lahko začnete."
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Neželena pošta"
 
-#: ../src/client/accounts/add-edit-page.vala:223
-msgid "2 weeks back"
-msgstr "2 tedna nazaj"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Smeti"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:224
-msgid "1 month back"
-msgstr "1 mesec nazaj"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Odhodno"
 
-#: ../src/client/accounts/add-edit-page.vala:225
-msgid "3 months back"
-msgstr "3 mesece nazaj"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Iskanje"
 
-#: ../src/client/accounts/add-edit-page.vala:226
-msgid "6 months back"
-msgstr "6 mesecev nazaj"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Arhiv"
 
-#: ../src/client/accounts/add-edit-page.vala:227
-msgid "1 year back"
-msgstr "1 leto nazaj"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Nobena"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-#| msgid "1 year back"
-msgid "2 years back"
-msgstr "2 leti nazaj"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:229
-#| msgid "1 year back"
-msgid "4 years back"
-msgstr "4 leta nazaj"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr ""
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:231
-msgid "Everything"
-msgstr "Vse"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:630
-msgid "Remem_ber passwords"
-msgstr "Zap_omni si gesla"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:637 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "Zap_omni si geslo"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:671
-msgid "Unable to validate:\n"
-msgstr "Potrditev ni možna:\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Ostalo"
 
-#: ../src/client/accounts/add-edit-page.vala:673
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "&#8226; Napačen vzdevek računa.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:676
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "&#8226; Epoštni naslov je že dodan v Geary.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:680
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "&#8226; Napaka pri IMAP povezavi.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:683
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "&#8226; IMAP uporabniško ime ali geslo je napačno.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:686
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "&#8226; Napaka pri SMTP povezavi.\n"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:689
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "&#8226; SMTP uporabniško ime ali geslo je napačno.\n"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:693
-msgid "        &#8226; Connection error.\n"
-msgstr "&#8226; Napaka pri povezavi.\n"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:697
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "&#8226; Uporabniško ime ali geslo je napačno.\n"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr ""
 
-#: ../src/client/application/geary-application.vala:19
-#| msgid "Copyright 2011-2013 Yorba Foundation"
-msgid "Copyright 2011-2014 Yorba Foundation"
-msgstr "Avtorske pravice © 2004-2014 Yorba Foundation"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(brez zadeve)"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Obiščite spletno stran Yorba"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %-e. %b, %Y ob %-l:%M %p"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Output debugging information"
-msgstr "Izpis informacij o razhroščevanju"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "%1$s, je %2$s napisal:"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Log conversation monitoring"
-msgstr "Beleži nadzorovanje pogovorov"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s je napisal:"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log network deserialization"
-msgstr "Beleži serializacijo mreže"
+#. / 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:234
+msgid "On %s:"
+msgstr "Na %s:"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network activity"
-msgstr "Beleži aktivnost mreže"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Posredovano sporočilo ----------"
 
-#. / 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:16
-msgid "Log IMAP replay queue"
-msgstr "Beleži IMAP vrsto ponovitev"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Od: %s\n"
 
-#. / Serialization is how commands and responses are converted into a stream of bytes for
-#. / network transmission
-#: ../src/client/application/geary-args.vala:19
-msgid "Log network serialization"
-msgstr "Beleži serializacijo mreže"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Zadeva: %s\n"
 
-#: ../src/client/application/geary-args.vala:20
-msgid "Log periodic activity"
-msgstr "Beleži periodično aktivnost"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Datum: %s\n"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log database queries (generates lots of messages)"
-msgstr "Beleži poizvedbe podatkovne baze (ustvari veli sporočil)"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Za: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:23
-msgid "Log folder normalization"
-msgstr "Beleži normalizacijo map"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Kp: %s\n"
 
-#: ../src/client/application/geary-args.vala:24
-msgid "Allow inspection of WebView"
-msgstr "Allow inspection of WebView"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "nobeno"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Display program version"
-msgstr "Prikaži različico programa"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Poštni klient"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:47
-#, c-format
-msgid "Use %s to open a new composer window"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
 msgstr ""
 
-#: ../src/client/application/geary-args.vala:48
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Prosimo prijavite komentarje, predloge in hrošče na:"
-
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:55
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Razčlenjevanje možnosti ukazne vrstice ni uspelo: %s\n"
-
-#: ../src/client/application/geary-args.vala:66
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Neznana možnost ukazne vrstice \"%s\"\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Obiščite spletno stran Yorba"
 
-#: ../src/client/application/geary-controller.vala:46
-msgid "_Delete"
-msgstr "_Briši"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:47
-#, fuzzy
-#| msgid "Delete conversation (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
-msgstr "Japonsko (_Shift-JIS)"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:48
-#, fuzzy
-#| msgid "Delete conversations (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
-msgstr "Japonsko (_Shift-JIS)"
-
-#: ../src/client/application/geary-controller.vala:51
-#| msgid "Trash"
-msgid "_Trash"
-msgstr "_Smeti"
-
-#: ../src/client/application/geary-controller.vala:52
-#, fuzzy
-#| msgid "Archive conversations (Delete, Backspace, A)"
-msgid "Move conversation to trash (Delete, Backspace)"
-msgstr "Arhiviraj pogovore (Delete, Backspace, A)"
-
-#: ../src/client/application/geary-controller.vala:53
-#, fuzzy
-#| msgid "Archive conversations (Delete, Backspace, A)"
-msgid "Move conversations to trash (Delete, Backspace)"
-msgstr "Arhiviraj pogovore (Delete, Backspace, A)"
-
-#: ../src/client/application/geary-controller.vala:56
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Arhiv"
 
-#: ../src/client/application/geary-controller.vala:57
-#, fuzzy
-#| msgid "Move conversation"
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
-msgstr "Pogovor hipnega sporočanja"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:58
-#, fuzzy
-#| msgid "Move conversations"
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
-msgstr "<b>Zgodovina pogovorov</b>"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:61
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Označi kot _neželeno pošto"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Označi kot _želeno pošto"
 
-#: ../src/client/application/geary-controller.vala:64
-#: ../src/client/application/geary-controller.vala:275
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Označi pogovor"
 
-#: ../src/client/application/geary-controller.vala:65
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Označi pogovore"
 
-#: ../src/client/application/geary-controller.vala:66
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Dodaj oznako pogovoru"
 
-#: ../src/client/application/geary-controller.vala:67
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Dodaj oznako pogovorom"
 
-#: ../src/client/application/geary-controller.vala:68
-#: ../src/client/application/geary-controller.vala:314
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Premakni pogovor"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Premakni pogovore"
 
-#: ../src/client/application/geary-controller.vala:251
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "_Računi"
 
-#: ../src/client/application/geary-controller.vala:256
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Nastavitve"
 
-#: ../src/client/application/geary-controller.vala:260
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Pomoč"
 
-#: ../src/client/application/geary-controller.vala:264
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/client/application/geary-controller.vala:268
-msgid "_Donate"
-msgstr "_Prispevaj"
-
-#: ../src/client/application/geary-controller.vala:272
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Zapusti"
 
-#: ../src/client/application/geary-controller.vala:277
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Označi kot..."
 
-#: ../src/client/application/geary-controller.vala:283
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Označi kot _prebrano"
 
-#: ../src/client/application/geary-controller.vala:289
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Označi kot _neprebrano"
 
-#: ../src/client/application/geary-controller.vala:295
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "Dodaj _zvezdico"
 
-#: ../src/client/application/geary-controller.vala:300
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "_Odstrani zvezdico"
 
-#: ../src/client/application/geary-controller.vala:310
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Dodaj oznako"
 
-#: ../src/client/application/geary-controller.vala:311
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Oznaka"
 
-#: ../src/client/application/geary-controller.vala:315
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Premakni"
 
-#: ../src/client/application/geary-controller.vala:319
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Sestavi novo sporočilo (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:323
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1567
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Odgovori"
 
-#: ../src/client/application/geary-controller.vala:324
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Odgovori (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:328
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "O_dgovori na vse"
 
-#: ../src/client/application/geary-controller.vala:329
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Odgovori na vse (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:334
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1577
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Posreduj"
 
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Posreduj (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:618
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:746
+msgid "Unable to store server trust exception"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Vaše nastavitve niso varne"
 
-#: ../src/client/application/geary-controller.vala:619
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -431,51 +440,42 @@ msgstr ""
 "lahko druga oseba na omrežju prebere vaše uporabniško ime in geslo.  Ali ste "
 "prepričani, da želite to storiti?"
 
-#: ../src/client/application/geary-controller.vala:620
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "_Nadaljuj"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:698
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Napaka pri pošiljanju epošte"
 
-#: ../src/client/application/geary-controller.vala:699
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
 msgstr ""
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:703
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
-#, fuzzy
-#| msgid "Error sending email"
 msgid "Error saving sent mail"
-msgstr "Napaka med branjem poštne datoteke: %s"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:704
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:773
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Oznake"
 
-#. 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:785
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Podatkovne baze za %s ni mogoče odpreti"
 
-#: ../src/client/application/geary-controller.vala:786
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -488,38 +488,32 @@ msgid ""
 "<b>The mail on the your server will not be affected.</b>"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:788
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "Ponovno _izgradi"
 
-#: ../src/client/application/geary-controller.vala:788
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "I_zhod"
 
-#: ../src/client/application/geary-controller.vala:797
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Podatkovne baze za \"%s\" ni mogoče ponovno zgraditi"
 
-#: ../src/client/application/geary-controller.vala:798
-#, fuzzy, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
 "%s"
-msgstr "Napaka med snemanjem: %s\n"
-
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:820
-#: ../src/client/application/geary-controller.vala:830
-#: ../src/client/application/geary-controller.vala:841
-#, fuzzy, c-format
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
-msgstr "Ni mogoče odpreti datoteke namizja %s za zaganjalnik%s%s pulta\n"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:821
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -530,7 +524,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:831
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -539,7 +533,7 @@ msgid ""
 "Please install the latest version of Geary and try again."
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:842
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -547,23 +541,29 @@ msgid ""
 "Please check your network connection and restart Geary."
 msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1335
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "O %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1338
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
-msgstr "zasluge-za-prevajanje"
+msgstr ""
+"zasluge-za-prevajanje\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Matej Urbančič https://launchpad.net/~mateju";
 
-#: ../src/client/application/geary-controller.vala:1595
-#, c-format
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Ste prepričani, da želite odpreti \"%s\"?"
 
-#: ../src/client/application/geary-controller.vala:1596
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -571,513 +571,377 @@ msgstr ""
 "Priponke so lahko škodljive vašemu sistemu, če jih odprete.  Odpirajte samo "
 "datoteke iz zaupljivih virov."
 
-#: ../src/client/application/geary-controller.vala:1597
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Ne _sprašuj me več"
 
-#: ../src/client/application/geary-controller.vala:1615
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Datoteka z imenom \"%s\" že obstaja.  Ali jo želite zamenjati?"
 
-#: ../src/client/application/geary-controller.vala:1617
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "Datoteka že obstaja v \"%s\".  Če jo zamenjate, boste prepisali njeno "
 "vsebino."
 
-#: ../src/client/application/geary-controller.vala:1620
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
-#: ../src/client/application/geary-controller.vala:1922
-#, fuzzy
-#| 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] "Ali res želite izbrisati to kategorijo?\n"
-msgstr[1] "Želite zavreči to sporočilo?"
-msgstr[2] "Želite zavreči to sporočilo?"
-msgstr[3] "Želite zavreči to sporočilo?"
-
-#: ../src/client/application/geary-controller.vala:1924
-#| msgid "_Delete"
-msgid "Delete"
-msgstr "Izbriši"
+#: ../src/client/application/geary-controller.vala:2309
+msgid "Close open draft messages?"
+msgstr ""
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, fuzzy, c-format
-#| msgid "%i matches"
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i zadetkov"
-msgstr[1] "%i zadetkov"
-msgstr[2] "%i zadetkov"
-msgstr[3] "%i zadetkov"
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, fuzzy, c-format
-#| msgid "%i matches (wrapped)"
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "Primerjaj skladnosti polj"
-msgstr[1] "%i zadetkov (celotno)"
-msgstr[2] "%i zadetkov (celotno)"
-msgstr[3] "%i zadetkov (celotno)"
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "Ni zadetkov"
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
+msgstr ""
 
-#: ../src/client/components/main-toolbar.vala:11
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Iskanje"
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
 
-#. Spacer.
-#. Search bar.
-#: ../src/client/components/main-toolbar.vala:84
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Preišči vso pošto v računu za ključne besede (Ctrl+S)"
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
+msgstr ""
 
-#: ../src/client/components/main-toolbar.vala:205
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indeksiranje računa %s"
+#: ../src/client/application/geary-controller.vala:2489
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/client/components/main-toolbar.vala:212
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, fuzzy, c-format
-msgid "Search %s account"
-msgstr "Iskanje računa"
+#: ../src/client/application/geary-controller.vala:2491
+#| msgid "_Delete"
+msgid "Delete"
+msgstr "Izbriši"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Pošiljanje..."
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_V redu"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/components/stock.vala:19 ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Prekliči"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/components/stock.vala:23 ../ui/account_list.glade.h:4
-#: ../ui/preferences.glade.h:1
-msgid "_Close"
-msgstr "_Zapri"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr ""
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Zavrži"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Izpis informacij o razhroščevanju"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Odpri"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Beleži nadzorovanje pogovorov"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Tiskaj..."
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Beleži serializacijo mreže"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Odstrani"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Beleži aktivnost mreže"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1035
-msgid "Select _All"
-msgstr "Izberi _vse"
+#. / 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 "Beleži IMAP vrsto ponovitev"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Obdrži"
+#. / 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 "Beleži serializacijo mreže"
 
-#: ../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "Novo sporočilo"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Beleži periodično aktivnost"
 
-#: ../src/client/composer/composer-window.vala:41
-msgid "Saved"
-msgstr "Shranjeno"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Beleži poizvedbe podatkovne baze (ustvari veli sporočil)"
 
-#: ../src/client/composer/composer-window.vala:42
-msgid "Saving"
-msgstr "Shranjevanje"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Beleži normalizacijo map"
 
-#: ../src/client/composer/composer-window.vala:43
-msgid "Error saving"
-msgstr "Napaka pri shranjevanju"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Allow inspection of WebView"
 
-#. / 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"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
 msgstr ""
 
-#: ../src/client/composer/composer-window.vala:679
-msgid "Do you want to discard the unsaved message?"
-msgstr "Želite zavreči neshranjeno sporočilo?"
-
-#: ../src/client/composer/composer-window.vala:682
-msgid "Do you want to discard this message?"
-msgstr "Želite zavreči to sporočilo?"
-
-#: ../src/client/composer/composer-window.vala:759
-msgid "Send message with an empty subject and body?"
-msgstr "Želite poslati sporočilo brez zadeve in vsebine?"
-
-#: ../src/client/composer/composer-window.vala:761
-msgid "Send message with an empty subject?"
-msgstr "Želite poslati sporočilo brez zadeve?"
-
-#: ../src/client/composer/composer-window.vala:763
-msgid "Send message with an empty body?"
-msgstr "Želite poslati sporočilo brez vsebine?"
-
-#: ../src/client/composer/composer-window.vala:765
-msgid "Send message without an attachment?"
-msgstr "Želite poslati sporočilo brez priponke?"
-
-#: ../src/client/composer/composer-window.vala:948
-msgid "Cannot add attachment"
-msgstr "Priponke ni možno dodati"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Prikaži različico programa"
 
-#: ../src/client/composer/composer-window.vala:959
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "\"%s\" ni bilo mogoče najti."
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr ""
 
-#: ../src/client/composer/composer-window.vala:966
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" je mapa."
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Prosimo prijavite komentarje, predloge in hrošče na:"
 
-#: ../src/client/composer/composer-window.vala:973
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" je prazna datoteka."
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Razčlenjevanje možnosti ukazne vrstice ni uspelo: %s\n"
 
-#: ../src/client/composer/composer-window.vala:987
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "\"%s\" ni bilo mogoče odpreti za branje."
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Neznana možnost ukazne vrstice \"%s\"\n"
 
-#: ../src/client/composer/composer-window.vala:994
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" že pripeto za dostavo."
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Nova sporočila"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-window.vala:1003
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d novo sporočilo"
+msgstr[1] "%d nova sporočila"
+msgstr[2] "%d nova sporočila"
+msgstr[3] "%d novih sporočil"
 
-#: ../src/client/composer/composer-window.vala:1265
-msgid "Select Color"
-msgstr "Izberi barvo"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] ""
+msgstr[1] ""
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-window.vala:1655
-#| msgid "From:"
-msgid "_From:"
-msgstr "_Od:"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+msgstr[1] ""
 
-#. For other types of messages, just show the from account.
-#. Composer label (without mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#. Geary account mail will be sent from
-#: ../src/client/composer/composer-window.vala:1671
-#: ../src/client/conversation-viewer/conversation-viewer.vala:628
-#: ../ui/composer.glade.h:41
-msgid "From:"
-msgstr "Od:"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Odpri"
 
 #: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Jaz"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:255
-msgid "No conversations selected."
-msgstr "Ni izbranih pogovorov."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:257
-#, fuzzy, c-format
-#| msgid "%u conversations selected."
-msgid "%u conversation selected."
-msgid_plural "%u conversations selected."
-msgstr[0] "Izbrano dostopno"
-msgstr[1] "%u pogovorov izbranih."
-msgstr[2] "%u pogovorov izbranih."
-msgstr[3] "%u pogovorov izbranih."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:286
-msgid "No search results found."
-msgstr "Ni najdenih rezultatov iskanja."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:288
-msgid "No conversations in folder."
-msgstr "V mapi ni pogovorov."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:527
-msgid "This message contains remote images."
-msgstr "To sporočilo vsebuje oddaljene slike."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:527
-msgid "Show Images"
-msgstr "Prikaži slike"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:528
-#, fuzzy
-msgid "Always Show From Sender"
-msgstr "Najdi sporočila pošiljatelja"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:552
-msgid "Edit Draft"
-msgstr "Uredi osnutek"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:631
-msgid "To:"
-msgstr "Za:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:634
-msgid "Cc:"
-msgstr "Kp:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:637
-msgid "Bcc:"
-msgstr "Skp:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:640
-msgid "Subject:"
-msgstr "Zadeva:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:643
-msgid "Date:"
-msgstr "Datum:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:850
-#, fuzzy, c-format
-#| msgid "%u read messages"
-msgid "%u read message"
-msgid_plural "%u read messages"
-msgstr[0] "preberi sporočilo"
-msgstr[1] "%u prebranih sporočil"
-msgstr[2] "%u prebranih sporočil"
-msgstr[3] "%u prebranih sporočil"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:982
-#, c-format
-msgid "This message was sent successfully, but could not be saved to %s."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
 msgstr ""
 
-#. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1008
-#: ../ui/composer.glade.h:4
-msgid "_Copy"
-msgstr "_Kopiraj"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr ""
 
-#. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1016
-msgid "Copy _Email Address"
-msgstr "Kopiraj _epoštni naslov"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr ""
 
-#. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1021
-#: ../ui/composer.glade.h:17
-msgid "Copy _Link"
-msgstr "Kopiraj _povezavo"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr ""
 
-#. Select message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1029
-msgid "Select _Message"
-msgstr "Izberi _sporočilo"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Izberite datoteko"
 
-#. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1041
-msgid "_Inspect"
-msgstr "_Preveri"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Pripni"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1267
-msgid "This link appears to go to"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
 msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1268
-#, fuzzy
-msgid "but actually goes to"
-msgstr "Skoči na naslednji znak."
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Računi"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1323
-#, fuzzy
-msgid " (Invalid?)"
-msgstr "<neveljavno>"
+#. / 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 "Ime Priimek"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1515
-msgid "_Save As..."
-msgstr "_Shrani kot..."
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Dobrodošli v Geary."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1520
-msgid "Save All A_ttachments..."
-msgstr "Shrani vse _priponke"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Vpišite podatke o svojem računu, da lahko začnete."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1534
-msgid "_Save Image As..."
-msgstr "_Shrani sliko kot..."
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 tedna nazaj"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "Shrani _priponko"
-msgstr[1] "Shrani obe _priponki"
-msgstr[2] "Shrani vse _priponke"
-msgstr[3] "Shrani vse _priponke"
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 mesec nazaj"
 
-#. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1572
-msgid "Reply to _All"
-msgstr "Odgovori _vsem"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 mesece nazaj"
 
-#. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1589
-msgid "_Mark as Read"
-msgstr "_Označi kot prebrano"
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 mesecev nazaj"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1593
-msgid "_Mark as Unread"
-msgstr "_Označi kot neprebrano"
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 leto nazaj"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1599
-msgid "Mark Unread From _Here"
-msgstr "Označi kot neprebrano od _tukaj"
+#: ../src/client/accounts/add-edit-page.vala:258
+#| msgid "1 year back"
+msgid "2 years back"
+msgstr "2 leti nazaj"
 
-#. Separator.
-#. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1614
-msgid "_View Source"
-msgstr "_Pokaži izvorno kodo"
+#: ../src/client/accounts/add-edit-page.vala:259
+#| msgid "1 year back"
+msgid "4 years back"
+msgstr "4 leta nazaj"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1908
-#: ../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "nobeno"
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Vse"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2038
-msgid "Failed to open default text editor."
-msgstr "Odpiranje privzetega urejevalnika besedila ni uspelo."
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-web-view.vala:296
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - Preverjanje pogovorov"
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Izberite datoteko"
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "Zap_omni si gesla"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Pripni"
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "Zap_omni si geslo"
 
-#. 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
-#, fuzzy
-#| msgid "Please enter your email password"
-msgid "Please enter your password"
-msgstr "Vnesite svoje geslo Kerberos:"
-
-#. Label displaying total number of email messages in a folder
-#: ../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] "%d sporočilo"
-msgstr[1] "%d sporočili"
-msgstr[2] "%d sporočila"
-msgstr[3] "%d sporočil"
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Potrditev ni možna:\n"
 
-#. / 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 neprebrano"
-msgstr[1] "%d neprebrani"
-msgstr[2] "%d neprebrana"
-msgstr[3] "%d neprebranih"
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Napačen vzdevek računa.\n"
 
-#. / 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"
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Epoštni naslov je že dodan v Geary.\n"
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Prejeto"
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Napaka pri IMAP povezavi.\n"
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, fuzzy, c-format
-#| msgid "%d results"
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "Seznam rezultatov"
-msgstr[1] "%d rezultatov"
-msgstr[2] "%d rezultatov"
-msgstr[3] "%d rezultatov"
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; IMAP uporabniško ime ali geslo je napačno.\n"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Nova sporočila"
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Napaka pri SMTP povezavi.\n"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d novo sporočilo"
-msgstr[1] "%d nova sporočila"
-msgstr[2] "%d nova sporočila"
-msgstr[3] "%d novih sporočil"
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; SMTP uporabniško ime ali geslo je napačno.\n"
 
-#: ../src/client/notification/libnotify.vala:75
-#, fuzzy, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] "Okno novega sporočila"
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Napaka pri povezavi.\n"
 
-#: ../src/client/notification/libnotify.vala:107
-#, fuzzy, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] "Vprašaj za vsako sporočilo"
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Uporabniško ime ali geslo je napačno.\n"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Odpri"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Shrani"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Dodaj"
 
 #. / 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
@@ -1135,22 +999,16 @@ msgid "Now"
 msgstr "Zdaj"
 
 #: ../src/client/util/util-date.vala:167
-#, fuzzy, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
-msgstr[0] "pred {0} dnevi, {1}"
+msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../src/client/util/util-date.vala:171
-#, fuzzy, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
-msgstr[0] "pred {0} dnevi, {1}"
+msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../src/client/util/util-date.vala:178
 msgid "Yesterday"
@@ -1159,15 +1017,9 @@ msgstr "Včeraj"
 #. / 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:30
-#: ../src/engine/rfc822/rfc822-message.vala:742
-msgid "(no subject)"
-msgstr "(brez zadeve)"
-
 #: ../src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "bytov"
@@ -1192,645 +1044,701 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KB"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
-
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d sporočilo"
+msgstr[1] "%d sporočili"
+msgstr[2] "%d sporočila"
+msgstr[3] "%d sporočil"
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d neprebrano"
+msgstr[1] "%d neprebrani"
+msgstr[2] "%d neprebrana"
+msgstr[3] "%d neprebranih"
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Ostalo"
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
 msgstr "Prejeto"
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Osnutki"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr ""
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Poslano"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Z zvezdico"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "Ni izbranih pogovorov."
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Pomembno"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Vsa pošta"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
+msgstr "Ni najdenih rezultatov iskanja."
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Neželena pošta"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
+msgstr "V mapi ni pogovorov."
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Smeti"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
+msgstr "To sporočilo vsebuje oddaljene slike."
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Odhodno"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr "Prikaži slike"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Arhiv"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
+msgstr ""
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:25
-msgid "None"
-msgstr "Nobena"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
+msgstr "Uredi osnutek"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.
-#: ../src/engine/imap-db/imap-db-account.vala:662
-#, fuzzy
-#| msgid "Save A_ttachment..."
-#| msgid_plural "Save All A_ttachments..."
-msgid "attachment"
-msgstr "priloga"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "Od:"
 
-#. / Can be typed in the search box like bcc:johndoe example com to find
-#. / messages bcc'd to a particular person.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:665
-#: ../src/engine/imap-db/imap-db-account.vala:684
-#, fuzzy
-msgid "bcc"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "Za:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Kp:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
 msgstr "Skp:"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:668
-#, fuzzy
-msgid "body"
-msgstr "Telo"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "Zadeva:"
 
-#. / Can be typed in the search box like cc:johndoe example com to find
-#. / messages cc'd to a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:671
-#: ../src/engine/imap-db/imap-db-account.vala:684
-#, fuzzy
-#| msgid "Bcc:"
-msgid "cc"
-msgstr "Kp:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Datum:"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.
-#: ../src/engine/imap-db/imap-db-account.vala:674
-#: ../src/engine/imap-db/imap-db-account.vala:684
-#, fuzzy
-msgid "from"
-msgstr "izvajalec"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:677
-#, fuzzy
-#| msgid "Subject:"
-msgid "subject"
-msgstr "Zadeva"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
+msgstr ""
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:680
-#: ../src/engine/imap-db/imap-db-account.vala:684
-#, fuzzy
-msgid "to"
-msgstr "do"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "_Kopiraj"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.
-#: ../src/engine/imap-db/imap-db-account.vala:699
-#, fuzzy
-msgid "me"
-msgstr "moj"
-
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:439
-#, fuzzy
-#| msgid "Drafts"
-msgid "Drafts | Draft"
-msgstr "Shrani osnutek"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "Kopiraj _epoštni naslov"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:444
-#, fuzzy
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "Ni mogoče izvršiti %s: pošta ni poslana."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "Kopiraj _povezavo"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:449
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
+msgstr "Izberi _sporočilo"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Izberi _vse"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "_Preveri"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
 msgstr ""
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:454
-#, fuzzy
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Pokaži &dvojiško"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
+msgstr ""
 
-#. / 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 ob %-l:%M %p"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
+msgstr ""
 
-#. / 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 "%1$s, je %2$s napisal:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
+msgstr "_Shrani sliko kot..."
 
-#. / 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 je napisal:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_Shrani kot..."
 
-#. / 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 "Na %s:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "Shrani vse _priponke"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Posredovano sporočilo ----------"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] "Shrani _priponko"
+msgstr[1] "Shrani obe _priponki"
+msgstr[2] "Shrani vse _priponke"
+msgstr[3] "Shrani vse _priponke"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "Od: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "Odgovori _vsem"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Zadeva: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "_Označi kot prebrano"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "Datum: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "_Označi kot neprebrano"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "Za: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
+msgstr "Označi kot neprebrano od _tukaj"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Kp: %s\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "_Pokaži izvorno kodo"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "Odpiranje privzetega urejevalnika besedila ni uspelo."
+
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr "%s - Preverjanje pogovorov"
+
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Shranjeno"
+
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Shranjevanje"
+
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Napaka pri shranjevanju"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Računa ni mogoče odstraniti</span> "
 
-#: ../ui/account_cannot_remove.glade.h:2
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Novo sporočilo"
+
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Želite zavreči to sporočilo?"
+
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Želite poslati sporočilo brez zadeve in vsebine?"
+
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Želite poslati sporočilo brez zadeve?"
+
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Želite poslati sporočilo brez vsebine?"
+
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Želite poslati sporočilo brez priponke?"
+
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Priponke ni možno dodati"
+
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "\"%s\" ni bilo mogoče najti."
+
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" je mapa."
+
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" je prazna datoteka."
+
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "\"%s\" ni bilo mogoče odpreti za branje."
+
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "\"%s\" že pripeto za dostavo."
+
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Izberi barvo"
+
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:2364
+#| msgid "From:"
+msgid "_From:"
+msgstr "_Od:"
+
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
 msgstr ""
-"Ta račun ima trenutno odprto okno za sestavljanje sporoči. Pošljite ali "
-"zavržite sporočilo in poskusite ponovno."
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Dodaj račun"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Pošiljanje..."
+
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "Ni zadetkov"
+
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_V redu"
+
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Prekliči"
+
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Zapri"
+
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Zavrži"
+
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Odpri"
+
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Tiskaj..."
+
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Odstrani"
+
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Obdrži"
+
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Preišči vso pošto v računu za ključne besede (Ctrl+S)"
+
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Indeksiranje računa %s"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Uredi račun"
+#~| msgid "Geary Mail"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Odstrani račun"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary Mail"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Prosimo počakajte, da Geary potrdi vaš račun."
+#~ msgid "Send and receive email"
+#~ msgstr "Pošlji in prejmi epošto"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Razveljavi"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Epošta;E-pošta;Pošta;"
 
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Ponovi"
+#~ msgid "Compose Message"
+#~ msgstr "Sestavi sporočilo"
 
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "_Izreži"
+#~| msgid "Copyright 2011-2013 Yorba Foundation"
+#~ msgid "Copyright 2011-2014 Yorba Foundation"
+#~ msgstr "Avtorske pravice © 2004-2014 Yorba Foundation"
 
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "_Prilepi"
+#~ msgid "_Delete"
+#~ msgstr "_Briši"
 
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Levo"
+#~| msgid "Trash"
+#~ msgid "_Trash"
+#~ msgstr "_Smeti"
 
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Desno"
+#~ msgid "_Donate"
+#~ msgstr "_Prispevaj"
 
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Sredinsko"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Želite zavreči neshranjeno sporočilo?"
 
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Obojestransko"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Računa ni mogoče odstraniti</span> "
 
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Povezava (Ctrl+L)"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Ta račun ima trenutno odprto okno za sestavljanje sporoči. Pošljite ali "
+#~ "zavržite sporočilo in poskusite ponovno."
 
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "_Barva"
+#~ msgid "Add account"
+#~ msgstr "Dodaj račun"
 
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Več možnosti"
+#~ msgid "Edit account"
+#~ msgstr "Uredi račun"
 
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Dodaj narekovaje  (Ctrl+])"
+#~ msgid "Remove account"
+#~ msgstr "Odstrani račun"
 
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Odstrani narekovaje (Ctrl+[)"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Prosimo počakajte, da Geary potrdi vaš račun."
 
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Odstrani oblikovanje (Ctrl+Presledek)"
+#~ msgid "_Undo"
+#~ msgstr "_Razveljavi"
 
-#: ../ui/composer.glade.h:16
-#, fuzzy
-#| msgid "Paste _With Formatting"
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Moderni slog s finančnim oblikovanjem"
+#~ msgid "_Redo"
+#~ msgstr "_Ponovi"
 
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Krepko (Ctrl+B)"
+#~ msgid "Cu_t"
+#~ msgstr "_Izreži"
 
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Ležeče (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Podčrtano (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Prečrtano (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "_Oblikovano besedilo"
-
-#: ../ui/composer.glade.h:23
-msgid "Lar_ge"
-msgstr "_Velika"
-
-#: ../ui/composer.glade.h:24
-msgid "Large"
-msgstr "Velika"
-
-#: ../ui/composer.glade.h:25
-msgid "_Medium"
-msgstr "_Srednja"
-
-#: ../ui/composer.glade.h:26
-msgid "Medium"
-msgstr "Srednja"
-
-#: ../ui/composer.glade.h:27
-msgid "_Small"
-msgstr "_Majhna"
-
-#: ../ui/composer.glade.h:28
-msgid "Small"
-msgstr "Majhna"
-
-#: ../ui/composer.glade.h:29
-#, fuzzy
-msgid "S_ans Serif"
-msgstr "Pisava Serif:"
+#~ msgid "_Paste"
+#~ msgstr "_Prilepi"
 
-#: ../ui/composer.glade.h:30
-msgid "Sans Serif"
-msgstr "Brez-serifna"
+#~ msgid "_Left"
+#~ msgstr "_Levo"
 
-#: ../ui/composer.glade.h:31
-msgid "S_erif"
-msgstr ""
+#~ msgid "_Right"
+#~ msgstr "_Desno"
 
-#: ../ui/composer.glade.h:32
-msgid "Serif"
-msgstr "Serifna"
+#~ msgid "_Center"
+#~ msgstr "_Sredinsko"
 
-#: ../ui/composer.glade.h:33
-msgid "_Fixed Width"
-msgstr "_Nespremenljiva širina"
+#~ msgid "_Justify"
+#~ msgstr "_Obojestransko"
 
-#: ../ui/composer.glade.h:34
-msgid "Fixed Width"
-msgstr "Nespremenljiva širina"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Povezava (Ctrl+L)"
 
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:36
-msgid "_To:"
-msgstr "_Za:"
-
-#: ../ui/composer.glade.h:37
-msgid "_Cc:"
-msgstr "_Kp:"
-
-#: ../ui/composer.glade.h:38
-#| msgid "Subject:"
-msgid "_Subject:"
-msgstr "_Zadeva:"
-
-#: ../ui/composer.glade.h:39
-#| msgid "Bcc:"
-msgid "_Bcc:"
-msgstr "_Skp:"
-
-#: ../ui/composer.glade.h:42
-msgid "Drop files here"
-msgstr "Povlecite datoteke sem"
-
-#: ../ui/composer.glade.h:43
-msgid "To add them as attachments"
-msgstr "Da jih dodate kot priponke."
-
-#: ../ui/composer.glade.h:44
-msgid "_Attach File"
-msgstr "_Pripni datoteko"
+#~ msgid "C_olor"
+#~ msgstr "_Barva"
 
-#: ../ui/composer.glade.h:45
-msgid "_Include Original Attachments"
-msgstr "_Vključi originalne priponke"
+#~ msgid "More options"
+#~ msgstr "Več možnosti"
 
-#: ../ui/composer.glade.h:46
-#| msgid "_Close"
-msgid "C_lose"
-msgstr "_Zapri"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Dodaj narekovaje  (Ctrl+])"
 
-#: ../ui/composer.glade.h:47
-msgid "_Send"
-msgstr "_Pošlji"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Odstrani narekovaje (Ctrl+[)"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Najdi:"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Odstrani oblikovanje (Ctrl+Presledek)"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Predhodno"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Krepko (Ctrl+B)"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Naslednje"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Ležeče (Ctrl+I)"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Razlikuj velikosti črk"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Podčrtano (Ctrl+U)"
 
-#: ../ui/find_bar.glade.h:5
-#| msgid "Labels"
-msgid "label"
-msgstr "oznaka"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Prečrtano (Ctrl+K)"
 
-#: ../ui/login.glade.h:1
-msgid "Password"
-msgstr "Geslo"
+#~ msgid "_Rich Text"
+#~ msgstr "_Oblikovano besedilo"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address:"
-msgstr "E_poštni naslov:"
+#~ msgid "Lar_ge"
+#~ msgstr "_Velika"
 
-#: ../ui/login.glade.h:3
-msgid "_Password:"
-msgstr "_Geslo:"
+#~ msgid "Large"
+#~ msgstr "Velika"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice:"
-msgstr "_Storitev:"
+#~ msgid "_Medium"
+#~ msgstr "_Srednja"
 
-#: ../ui/login.glade.h:5
-msgid "N_ame:"
-msgstr "_Ime:"
+#~ msgid "Medium"
+#~ msgstr "Srednja"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname:"
-msgstr "_Vzdevek:"
+#~ msgid "_Small"
+#~ msgstr "_Majhna"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Delo, dom, itd."
+#~ msgid "Small"
+#~ msgstr "Majhna"
 
-#: ../ui/login.glade.h:9
-#| msgid "Sent Mail"
-msgid "_Save sent mail"
-msgstr "_Shrani poslana sporočila"
+#~ msgid "Sans Serif"
+#~ msgstr "Brez-serifna"
 
-#: ../ui/login.glade.h:10
-msgid "IMAP settings"
-msgstr "IMAP nastavitve"
+#~ msgid "Serif"
+#~ msgstr "Serifna"
 
-#: ../ui/login.glade.h:11
-msgid "Se_rver:"
-msgstr "_Strežnik:"
+#~ msgid "_Fixed Width"
+#~ msgstr "_Nespremenljiva širina"
 
-#: ../ui/login.glade.h:12
-msgid "P_ort:"
-msgstr "_Vrata:"
+#~ msgid "Fixed Width"
+#~ msgstr "Nespremenljiva širina"
 
-#: ../ui/login.glade.h:13
-msgid "Ser_ver:"
-msgstr "_Strežnik:"
+#~ msgid "_To:"
+#~ msgstr "_Za:"
 
-#: ../ui/login.glade.h:14
-msgid "Por_t:"
-msgstr "_Vrata:"
+#~ msgid "_Cc:"
+#~ msgstr "_Kp:"
 
-#: ../ui/login.glade.h:15
-msgid "SMTP settings"
-msgstr "SMTP nastavitve"
+#~| msgid "Subject:"
+#~ msgid "_Subject:"
+#~ msgstr "_Zadeva:"
 
-#: ../ui/login.glade.h:16
-msgid "User_name:"
-msgstr "_Uporabniško ime:"
+#~| msgid "Bcc:"
+#~ msgid "_Bcc:"
+#~ msgstr "_Skp:"
 
-#: ../ui/login.glade.h:17
-msgid "Pass_word:"
-msgstr "_Geslo:"
+#~ msgid "Drop files here"
+#~ msgstr "Povlecite datoteke sem"
 
-#: ../ui/login.glade.h:18
-msgid "SMTP username"
-msgstr "SMTP uporabniško ime"
+#~ msgid "To add them as attachments"
+#~ msgstr "Da jih dodate kot priponke."
 
-#: ../ui/login.glade.h:19
-msgid "SMTP password"
-msgstr "SMTP geslo"
+#~ msgid "_Attach File"
+#~ msgstr "_Pripni datoteko"
 
-#: ../ui/login.glade.h:20
-msgid "_Username:"
-msgstr "_Uporabniško ime:"
-
-#: ../ui/login.glade.h:21
-msgid "IMAP username"
-msgstr "IMAP uporabniško ime"
-
-#: ../ui/login.glade.h:22
-msgid "IMAP password"
-msgstr "IMAP geslo"
-
-#: ../ui/login.glade.h:23
-msgid "Encr_yption:"
-msgstr "Ši_friranje:"
-
-#: ../ui/login.glade.h:24
-msgid "Encrypt_ion:"
-msgstr "Ši_friranje:"
-
-#: ../ui/login.glade.h:26
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
-
-#: ../ui/login.glade.h:27
-msgid "STARTTLS"
-msgstr "STARTTLS"
-
-#: ../ui/login.glade.h:28
-msgid "No authentication re_quired"
-msgstr "_Overitev ni potrebna"
-
-#: ../ui/login.glade.h:29
-#, fuzzy
-#| msgid "IMAP Credentials"
-msgid "Use IMAP cre_dentials"
-msgstr "IMAP poverilnice"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Vključi originalne priponke"
 
-#: ../ui/login.glade.h:30
-msgid "Storage"
-msgstr "Shranjevanje"
+#~| msgid "_Close"
+#~ msgid "C_lose"
+#~ msgstr "_Zapri"
 
-#: ../ui/login.glade.h:31
-msgid "_Download mail:"
-msgstr "_Prenesi pošto:"
+#~ msgid "_Send"
+#~ msgstr "_Pošlji"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "SMTP poverilnice"
+#~ msgid "Find:"
+#~ msgstr "Najdi:"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username:"
-msgstr "Uporabniško ime"
+#~ msgid "_Previous"
+#~ msgstr "_Predhodno"
 
-#: ../ui/password-dialog.glade.h:3
-msgid "Password:"
-msgstr "Geslo:"
+#~ msgid "_Next"
+#~ msgstr "_Naslednje"
 
-#: ../ui/password-dialog.glade.h:4
-#| msgid "_Remember passwords"
-msgid "_Remember password"
-msgstr "_Zapomni si geslo"
+#~ msgid "_Case sensitive"
+#~ msgstr "_Razlikuj velikosti črk"
 
-#: ../ui/preferences.glade.h:2
-msgid "Reading"
-msgstr "Branje"
+#~| msgid "Labels"
+#~ msgid "label"
+#~ msgstr "oznaka"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Automatically select next message"
-msgstr "_Samodejno izberi novo sporočilo"
+#~ msgid "Password"
+#~ msgstr "Geslo"
 
-#: ../ui/preferences.glade.h:4
-msgid "_Display conversation preview"
-msgstr "_Prikaži predogled pogovora"
+#~ msgid "E_mail address:"
+#~ msgstr "E_poštni naslov:"
 
-#: ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Skladatelj"
+#~ msgid "_Password:"
+#~ msgstr "_Geslo:"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "Omogoči _preverjanje pravopisa"
+#~ msgid "S_ervice:"
+#~ msgstr "_Storitev:"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "Obvestila"
+#~ msgid "N_ame:"
+#~ msgstr "_Ime:"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "_Predvajaj zvočna obvestila"
+#~ msgid "N_ickname:"
+#~ msgstr "_Vzdevek:"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "Prikaži _obvestila za novo pošto"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Delo, dom, itd."
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Ste prepričani, da želite odstraniti "
-"ta račun?</span> "
+#~| msgid "Sent Mail"
+#~ msgid "_Save sent mail"
+#~ msgstr "_Shrani poslana sporočila"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Vsa epošta povezana s tem računom bo odstranjena z vašega računalnika. To ne "
-"bo vplivalo na epošto na strežniku."
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP nastavitve"
+
+#~ msgid "Se_rver:"
+#~ msgstr "_Strežnik:"
+
+#~ msgid "P_ort:"
+#~ msgstr "_Vrata:"
+
+#~ msgid "Ser_ver:"
+#~ msgstr "_Strežnik:"
+
+#~ msgid "Por_t:"
+#~ msgstr "_Vrata:"
+
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP nastavitve"
+
+#~ msgid "User_name:"
+#~ msgstr "_Uporabniško ime:"
+
+#~ msgid "Pass_word:"
+#~ msgstr "_Geslo:"
+
+#~ msgid "SMTP username"
+#~ msgstr "SMTP uporabniško ime"
+
+#~ msgid "SMTP password"
+#~ msgstr "SMTP geslo"
+
+#~ msgid "_Username:"
+#~ msgstr "_Uporabniško ime:"
+
+#~ msgid "IMAP username"
+#~ msgstr "IMAP uporabniško ime"
+
+#~ msgid "IMAP password"
+#~ msgstr "IMAP geslo"
+
+#~ msgid "Encr_yption:"
+#~ msgstr "Ši_friranje:"
+
+#~ msgid "Encrypt_ion:"
+#~ msgstr "Ši_friranje:"
+
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
+
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
+
+#~ msgid "No authentication re_quired"
+#~ msgstr "_Overitev ni potrebna"
+
+#~ msgid "Storage"
+#~ msgstr "Shranjevanje"
+
+#~ msgid "_Download mail:"
+#~ msgstr "_Prenesi pošto:"
+
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP poverilnice"
+
+#~ msgid "Username:"
+#~ msgstr "Uporabniško ime"
+
+#~ msgid "Password:"
+#~ msgstr "Geslo:"
+
+#~| msgid "_Remember passwords"
+#~ msgid "_Remember password"
+#~ msgstr "_Zapomni si geslo"
+
+#~ msgid "Reading"
+#~ msgstr "Branje"
+
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Samodejno izberi novo sporočilo"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Prikaži predogled pogovora"
+
+#~ msgid "Composer"
+#~ msgstr "Skladatelj"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Omogoči _preverjanje pravopisa"
+
+#~ msgid "Notifications"
+#~ msgstr "Obvestila"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Predvajaj zvočna obvestila"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Prikaži _obvestila za novo pošto"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Ste prepričani, da želite odstraniti "
+#~ "ta račun?</span> "
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Vzdevek:"
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Vsa epošta povezana s tem računom bo odstranjena z vašega računalnika. To ne "
+#~ "bo vplivalo na epošto na strežniku."
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Epoštni naslov:"
+#~ msgid "Nickname:"
+#~ msgstr "Vzdevek:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-#, fuzzy
-msgid "Geary upgrade in progress."
-msgstr "Obravnavanje zahteve je v teku"
+#~ msgid "Email address:"
+#~ msgstr "Epoštni naslov:"
 
 #~ msgid "Archive conversation (Delete, Backspace, A)"
 #~ msgstr "Arhiviraj pogovor (Delete, Backspace, A)"
diff --git a/po/sr.po b/po/sr.po
index eeeac76..66816f5 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,464 +9,437 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-10-21 05:28+0000\n"
-"PO-Revision-Date: 2015-10-21 11:09+0200\n"
-"Last-Translator: Милош Поповић <gpopac gmail com>\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:11+0000\n"
+"Last-Translator: Miloš Popović <gpopac gmail com>\n"
 "Language-Team: српски <gnome-sr googlegroups org>\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:55+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
 "X-Project-Style: gnome\n"
-"X-Generator: Gtranslator 2.91.7\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Гери"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Програм за е-пошту"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Геријева пошта"
+"Language: sr\n"
 
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Шаље и прима е-пошту"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Нацрти | Нацрт | Drafts | Draft"
 
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
-"пошта;електронска пошта;ел. пошта;е-пошта;pošta;elektronska pošta;el. pošta;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Нова порука"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Пошаљи е-поштом"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Пошаљите датотеке помоћу Герија"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Сачувај"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Додај"
-
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "Додатне адресе за %s"
+"Послато | Послата пошта | Послата е-пошта | Sent | Sent Mail | Sent Email | "
+"Sent E-Mail"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Налози"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+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"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Име и презиме"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Смеће | Корпа | Trash | Rubbish | Rubbish Bin"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Welcome to Geary."
-msgstr "Добро дошли у Гери."
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Enter your account information to get started."
-msgstr "Унесите податке вашег налога за почетак."
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Сандуче"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "2 weeks back"
-msgstr "од пре 2 недеље"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Нацрти"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "1 month back"
-msgstr "од пре 1 месеца"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Послата пошта"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "3 months back"
-msgstr "од пре 3 месеци"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Омиљена"
 
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "6 months back"
-msgstr "од пре 6 месеци"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Важна"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "1 year back"
-msgstr "од пре 1 године"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Сва пошта"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-msgid "2 years back"
-msgstr "од пре 2 године"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Непожељна"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-msgid "4 years back"
-msgstr "од пре 4 година"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Смеће"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "Everything"
-msgstr "Све"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Одлазна"
 
-#: ../src/client/accounts/add-edit-page.vala:280
-msgid "Edit"
-msgstr "Уређивање"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Потражи"
 
-#: ../src/client/accounts/add-edit-page.vala:282
-#| msgid "_Previous"
-msgid "Preview"
-msgstr "Преглед"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Архива"
 
-#: ../src/client/accounts/add-edit-page.vala:723
-msgid "Remem_ber passwords"
-msgstr "_Запамти лозинке"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Ништа"
 
-#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "_Запамти лозинку"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "ИМАП"
 
-#: ../src/client/accounts/add-edit-page.vala:764
-msgid "Unable to validate:\n"
-msgstr "Не могу да потврдим:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "СМТП"
 
-#: ../src/client/accounts/add-edit-page.vala:766
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Неисправан надимак налога.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Гуглова пошта"
 
-#: ../src/client/accounts/add-edit-page.vala:769
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; Адреса е-поште је већ додата у Гери.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Јаху! пошта"
 
-#: ../src/client/accounts/add-edit-page.vala:773
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; Грешка ИМАП везе.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:776
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; Нетачно корисничко име или лозинка ИМАП-а.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Друга"
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; Грешка СМТП везе.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "прилог"
 
-#: ../src/client/accounts/add-edit-page.vala:782
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; Нетачно корисничко име или лозинка СМТП-а.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "бцц"
 
-#: ../src/client/accounts/add-edit-page.vala:786
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Грешка везе.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "текст поруке"
 
-#: ../src/client/accounts/add-edit-page.vala:790
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Нетачно корисничко име или лозинка.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "цц"
 
-#: ../src/client/application/geary-application.vala:19
-#| msgid "Copyright 2011-2014 Yorba Foundation"
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Ауторска права 2011-2015 Јорба (Yorba) Фондација"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "шаље"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Посетите веб страницу Јорбе"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "наслов"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Покреће Герија са скривеним главним прозором"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "прима"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Испиши податке за уклањање грешака"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "моја"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Бележи надгледање разговора"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(без наслова)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Бележи десеријализацију мреже"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %-e. %b, %Y. у %-l:%M %p"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Бележи мрежну активност"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "%1$s, %2$s пише:"
 
-#. / 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 "Бележи ред понављања ИМАП-а"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s пише:"
 
-#. / 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 "Бележи серијализацију мреже"
+#. / 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:234
+msgid "On %s:"
+msgstr "%s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Бележи повремену активност"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Прослеђена порука ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Бележи упите базе података (прави много порука)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Шаље: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Бележи нормализацију фасцикле"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Наслов: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Допушта прегледање Веб прегледа (WebView)"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Датум: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Опозива сва уверења сервера са ТЛС упозорењима"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Прима: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Приказује издање програма"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Цц: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Користите „%s“ за отварање новог прозора састављача"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "ништа"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Напомене, предлоге и грешке шаљите на:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Програм за е-пошту"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Не могу да обрадим опцију линије наредби: %s\n"
+#: ../src/client/application/geary-application.vala:19
+#| msgid "Copyright 2011-2014 Yorba Foundation"
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "Ауторска права 2011-2015 Јорба (Yorba) Фондација"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Непозната опција линије наредби: %s\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Посетите веб страницу Јорбе"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:61
 #| msgid "Move conversation"
 msgid "Delete conversation"
 msgstr "Обриши разговор"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Обриши разговор (Shift+Del)"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Обриши разговоре (Shift+Del)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:67
 #| msgid "Move conversation to trash (Delete, Backspace)"
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Премести разговор у смеће (Del, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:68
 #| msgid "Move conversations to trash (Delete, Backspace)"
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "Премести разговоре у смеће (Del, Backspace)"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Архивирај"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Архивирај разговор (А)"
 
-#: ../src/client/application/geary-controller.vala:75
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Архивирај разговоре (А)"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Означи као _непожељно"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Означи да није _непожељно"
 
-#: ../src/client/application/geary-controller.vala:81
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Означи разговор"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Означи разговоре"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Додај натпис разговору"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Додај натпис разговорима"
 
-#: ../src/client/application/geary-controller.vala:85
-#: ../src/client/application/geary-controller.vala:436
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Премести разговор"
 
-#: ../src/client/application/geary-controller.vala:86
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Премести разговоре"
 
-#: ../src/client/application/geary-controller.vala:373
-#: ../ui/app_menu.interface.h:1
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "_Налози"
 
-#: ../src/client/application/geary-controller.vala:378
-#: ../src/client/components/stock.vala:27 ../ui/app_menu.interface.h:2
+#: ../src/client/application/geary-controller.vala:377
+#: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Поставке"
 
-#: ../src/client/application/geary-controller.vala:382
-#: ../src/client/components/stock.vala:25 ../ui/app_menu.interface.h:4
+#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "По_моћ"
 
-#: ../src/client/application/geary-controller.vala:386
-#: ../src/client/components/stock.vala:21 ../ui/app_menu.interface.h:5
+#: ../src/client/application/geary-controller.vala:385
+#: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_О програму"
 
-#: ../src/client/application/geary-controller.vala:390
-#: ../ui/app_menu.interface.h:3
-msgid "_Donate"
-msgstr "До_бровољан прилог"
-
-#: ../src/client/application/geary-controller.vala:394
-#: ../src/client/components/stock.vala:29 ../ui/app_menu.interface.h:6
+#: ../src/client/application/geary-controller.vala:389
+#: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Изађи"
 
-#: ../src/client/application/geary-controller.vala:399
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Означи као..."
 
-#: ../src/client/application/geary-controller.vala:405
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Означи као _прочитано"
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Означи као _непрочитано"
 
-#: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Додај звездицу"
 
-#: ../src/client/application/geary-controller.vala:422
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "_Уклони звездицу"
 
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Додај натпис"
 
-#: ../src/client/application/geary-controller.vala:433
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Натпис"
 
-#: ../src/client/application/geary-controller.vala:437
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Премести"
 
-#: ../src/client/application/geary-controller.vala:441
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Саставите нову поруку (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:445
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Одговори"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Одговорите (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:450
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "Одговори _свима"
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Одговорите свима (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Проследи"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Проследите (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:496
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr "Испразни"
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr "Испразни фасцикле с непожељном поштом или отпад"
 
-#: ../src/client/application/geary-controller.vala:501
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr "Испразни _непожељно…"
 
-#: ../src/client/application/geary-controller.vala:505
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr "Испразни _отпад…"
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:538
+#: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
 msgstr "Приказ траке за претрагу"
 
-#: ../src/client/application/geary-controller.vala:752
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Не могу да сачувам изузетак поверења сервера"
 
-#: ../src/client/application/geary-controller.vala:989
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Ваша подешавања нису безбедна"
 
-#: ../src/client/application/geary-controller.vala:990
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -476,17 +449,17 @@ msgstr ""
 "корисничко име и лозинку може да прочита неко други на мрежи.  Да ли сигурно "
 "желите да наставите?"
 
-#: ../src/client/application/geary-controller.vala:991
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "_Настави"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Грешка слања е-поште"
 
-#: ../src/client/application/geary-controller.vala:1070
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -494,14 +467,12 @@ msgstr ""
 "Гери је наишао на грешку приликом слања е-поште.  Ако се проблем понови, "
 "ручно избришите е-пошту из фасцикле „За слање“."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Грешка приликом чувања послате поште"
 
-#: ../src/client/application/geary-controller.vala:1075
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -509,20 +480,15 @@ msgstr ""
 "Гери је наишао на грешку приликом чувања поруке у „Послато“.  Порука ће "
 "остати у вашој фасцикли „За слање“ све док је не избришете."
 
-#: ../src/client/application/geary-controller.vala:1144
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Натписи"
 
-#. 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:1156
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Не могу да отворим базу података за „%s“"
 
-#: ../src/client/application/geary-controller.vala:1157
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -545,21 +511,19 @@ msgstr ""
 "Поновна изградња базе података ће уништити е-пошту коју чувате на вашем "
 "рачунару и њене прилоге. <b>Пошта на вашем серверу ће остати нетакнута.</b>"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "Поново _изгради"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "_Изађи"
 
-#: ../src/client/application/geary-controller.vala:1168
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Не могу да поново изградим базу података за „%s“"
 
-#: ../src/client/application/geary-controller.vala:1169
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -569,17 +533,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1191
-#: ../src/client/application/geary-controller.vala:1201
-#: ../src/client/application/geary-controller.vala:1212
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Не могу да отворим локално сандуче за „%s“"
 
-#: ../src/client/application/geary-controller.vala:1192
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -597,7 +557,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1202
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -611,7 +571,7 @@ msgstr ""
 "\n"
 "Инсталирајте најновије издање Герија и покушајте поново."
 
-#: ../src/client/application/geary-controller.vala:1213
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -623,32 +583,33 @@ msgstr ""
 "\n"
 "Проверите вашу мрежу и поново покрените Герија."
 
-#: ../src/client/application/geary-controller.vala:1721
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "О програму „%s“"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1724
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
 msgstr ""
 "Мирослав Николић <miroslavnikolic rocketmail com>\n"
 "Милош Поповић <gpopac gmail com>\n"
 "\n"
-"http://prevod.org — превод на српски језик"
+"http://prevod.org — превод на српски језик\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Miloš Popović https://launchpad.net/~gpopac";
 
-#: ../src/client/application/geary-controller.vala:1990
+#: ../src/client/application/geary-controller.vala:1976
 #| msgid "Underline (Ctrl+U)"
 msgid "Undo move (Ctrl+Z)"
 msgstr "Опозови (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2000
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Да ли сте сигурни да желите да отворите „%s“?"
 
-#: ../src/client/application/geary-controller.vala:2001
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -656,314 +617,546 @@ msgstr ""
 "Приложене датотеке могу да оштете систем ако се отворе. Отворите датотеке "
 "само са поверљивих извора."
 
-#: ../src/client/application/geary-controller.vala:2002
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Не питај ме _поново"
 
-#: ../src/client/application/geary-controller.vala:2020
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Датотека под називом „%s“ већ постоји.  Да ли желите да је замените?"
 
-#: ../src/client/application/geary-controller.vala:2022
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "Датотека већ постоји у „%s“.  Уколико је замените преписаћете њен садржај."
 
-#: ../src/client/application/geary-controller.vala:2025
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Замени"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2323
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Да затворим отворене поруке с нацртима?"
 
-#: ../src/client/application/geary-controller.vala:2453
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr "Да испразним е-пошту из фасцикле „%s“?"
 
-#: ../src/client/application/geary-controller.vala:2454
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr "Ово ће уклонити пошту из Герија и на серверима ваше е-поште."
 
-#: ../src/client/application/geary-controller.vala:2455
+#: ../src/client/application/geary-controller.vala:2441
 #| msgid "\"%s\" could not be found."
 msgid "This cannot be undone."
 msgstr "Не можете да опозовете ову радњу."
 
-#: ../src/client/application/geary-controller.vala:2456
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr "Испразни „%s“"
 
-#: ../src/client/application/geary-controller.vala:2473
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 #| msgid "Error saving"
 msgid "Error emptying %s"
 msgstr "Грешка приликом пражњења „%s“"
 
-#: ../src/client/application/geary-controller.vala:2503
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Да ли желите трајно да обришете ову поруку?"
 msgstr[1] "Да ли желите трајно да обришете ове поруке?"
 msgstr[2] "Да ли желите трајно да обришете ове поруке?"
-msgstr[3] "Да ли желите трајно да обришете ову поруку?"
 
-#: ../src/client/application/geary-controller.vala:2505
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Обриши"
 
-#: ../src/client/application/geary-controller.vala:2536
+#: ../src/client/application/geary-controller.vala:2522
 #| msgid "Underline (Ctrl+U)"
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Опозови архивирање (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2551
+#: ../src/client/application/geary-controller.vala:2537
 #| msgid "Unquote text (Ctrl+[)"
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Опозови брисање (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2604
+#: ../src/client/application/geary-controller.vala:2590
 #| msgid "Underline (Ctrl+U)"
 msgid "Undo (Ctrl+Z)"
 msgstr "Опозови (Ctrl+Z)"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i резултат"
-msgstr[1] "%i резултата"
-msgstr[2] "%i резултата"
-msgstr[3] "%i резултат"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Покреће Герија са скривеним главним прозором"
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i резултат (умотано)"
-msgstr[1] "%i резултата (умотано)"
-msgstr[2] "%i резултата (умотано)"
-msgstr[3] "%i резултат (умотано)"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Испиши податке за уклањање грешака"
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "није нађено"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Бележи надгледање разговора"
 
-#: ../src/client/components/main-window.vala:430
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Бележи десеријализацију мреже"
 
-#: ../src/client/components/search-bar.vala:10
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Потражи"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Бележи мрежну активност"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:25
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Потражите кључне речи у свим порукама у налогу (Ctrl+S)"
+#. / 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 "Бележи ред понављања ИМАП-а"
 
-#: ../src/client/components/search-bar.vala:118
-#, c-format
-msgid "Indexing %s account"
-msgstr "Пописујем налог „%s“"
+#. / 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 "Бележи серијализацију мреже"
 
-#: ../src/client/components/search-bar.vala:129
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Тражим налог „%s“"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Бележи повремену активност"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Шаљем..."
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Бележи упите базе података (прави много порука)"
 
-#: ../src/client/components/stock.vala:18 ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "У _реду"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Бележи нормализацију фасцикле"
 
-#: ../src/client/components/stock.vala:19 ../ui/edit_alternate_emails.glade.h:3
-#: ../ui/password-dialog.glade.h:5 ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "От_кажи"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Допушта прегледање Веб прегледа (WebView)"
 
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Затвори"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Опозива сва уверења сервера са ТЛС упозорењима"
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "Од_баци"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Приказује издање програма"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "От_вори"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Користите „%s“ за отварање новог прозора састављача"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Штампај..."
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Напомене, предлоге и грешке шаљите на:"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Уклони"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Не могу да обрадим опцију линије наредби: %s\n"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "Изабери _све"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Непозната опција линије наредби: %s\n"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Задржи"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s — Нове поруке"
 
-#: ../src/client/composer/composer-widget.vala:73
-msgid "Saved"
-msgstr "Сачувана"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d нова порука"
+msgstr[1] "%d нове поруке"
+msgstr[2] "%d нових порука"
 
-#: ../src/client/composer/composer-widget.vala:74
-msgid "Saving"
-msgstr "Чувам"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, укупно %d нова порука"
+msgstr[1] "%s, укупно %d нове поруке"
+msgstr[2] "%s, укупно %d нових порука"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "Error saving"
-msgstr "Грешка приликом чувања"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d друга нова порука за %s)"
+msgstr[1] ""
+"%s\n"
+"(%d друге нове поруке за %s)"
+msgstr[2] ""
+"%s\n"
+"(%d других нових порука за %s)"
 
-#: ../src/client/composer/composer-widget.vala:76
-msgid "Press Backspace to delete quote"
-msgstr "Притисните Backspace за брисање наводника"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Отвори"
 
-#: ../src/client/composer/composer-widget.vala:77
-msgid "New Message"
-msgstr "Нова порука"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Ја"
 
-#. A 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:138
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr "Неповерљива веза: %s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr "Идентитет „%s“ сервера поште на „%s:%u“ не може бити проверен."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
 msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
-"прилог|прилогу|прилажем|атачмент|атачменту|attach|attaching|attaches|"
-"attachment|attachments|attached|enclose|enclosed|enclosing|encloses|"
-"enclosure|enclosures|prilog|prilogu|prilažem|atačment|atačmentu"
+"Ако изаберете „Веруј овом серверу“ или „Увек веруј овом серверу“ тада ваше "
+"корисничко име и лозинка могу да буду пренети несигурно."
 
-#: ../src/client/composer/composer-widget.vala:1102
-#: ../src/client/composer/composer-widget.vala:1106
-msgid "Do you want to discard this message?"
-msgstr "Да ли желите да одбаците ову поруку?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"Ако изаберете „Не веруј овом серверу“ тада Гери неће приступити овом серверу."
 
-#: ../src/client/composer/composer-widget.vala:1262
-msgid "Send message with an empty subject and body?"
-msgstr "Да пошаљем поруку са празним насловом и текстом?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Гери неће додати или освежити овај налог е-поште."
 
-#: ../src/client/composer/composer-widget.vala:1264
-msgid "Send message with an empty subject?"
-msgstr "Да пошаљем поруку са празним насловом?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"Ако изаберете „Не веруј овом серверу“ тада ће Гери зауставити приступање "
+"овом серверу."
 
-#: ../src/client/composer/composer-widget.vala:1266
-msgid "Send message with an empty body?"
-msgstr "Да пошаљем поруку без икаквог текста?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr "Гери ће изаћи ако немате других отворених налога е-поште."
 
-#: ../src/client/composer/composer-widget.vala:1268
-msgid "Send message without an attachment?"
-msgstr "Да пошаљем поруку без прилога?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Обратите се вашем администратору система или достављачу услуге е-поште ако "
+"имате неко питање о овим проблемима."
 
-#: ../src/client/composer/composer-widget.vala:1530
-msgid "Cannot add attachment"
-msgstr "Не могу да додам прилог"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr "Уверење сервера није потписано од стране познатог издавача"
 
-#: ../src/client/composer/composer-widget.vala:1541
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "Не могу да пронађем „%s“."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr "Идентитет сервера не одговара идентитету у уверењу"
 
-#: ../src/client/composer/composer-widget.vala:1548
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "„%s“ је фасцикла."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Уверење сервера је истекло"
 
-#: ../src/client/composer/composer-widget.vala:1555
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "„%s“ је празна датотека."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "Уверење сервера није активирано"
 
-#: ../src/client/composer/composer-widget.vala:1569
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "Не могу да отворим „%s“ за читање."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "Уверење сервера је опозвано и сада је неисправно"
 
-#: ../src/client/composer/composer-widget.vala:1576
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "„%s“ је већ приложено за испоруку."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "Уверење сервера се сматра несигурним"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1585
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr "Дошло је до грешке приликом обраде уверења сервера"
 
-#: ../src/client/composer/composer-widget.vala:1645
-msgid "To: "
-msgstr "Прима: "
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr "Гери захтева лозинку ваше е-поште да би наставио"
 
-#: ../src/client/composer/composer-widget.vala:1648
-msgid "Cc: "
-msgstr "Цц: "
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Изаберите датотеку"
 
-#: ../src/client/composer/composer-widget.vala:1651
-msgid "Bcc: "
-msgstr "Бцц: "
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Приложи"
 
-#: ../src/client/composer/composer-widget.vala:1654
-msgid "Reply-To: "
-msgstr "Одговор за: "
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr "Додатне адресе за %s"
 
-#: ../src/client/composer/composer-widget.vala:1887
-msgid "Select Color"
-msgstr "Изаберите боју"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Налози"
 
-#. 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:2322
-#, c-format
-msgid "%1$s via %2$s"
-msgstr "%1$s преко %2$s"
+#. / 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 "Име и презиме"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2364
-msgid "_From:"
-msgstr "_Шаље:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Добро дошли у Гери."
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Ја"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Унесите податке вашег налога за почетак."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "од пре 2 недеље"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "од пре 1 месеца"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "од пре 3 месеци"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "од пре 6 месеци"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "од пре 1 године"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "од пре 2 године"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "од пре 4 година"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Све"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "Уређивање"
+
+#: ../src/client/accounts/add-edit-page.vala:282
+#| msgid "_Previous"
+msgid "Preview"
+msgstr "Преглед"
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "_Запамти лозинке"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "_Запамти лозинку"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Не могу да потврдим:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Неисправан надимак налога.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Адреса е-поште је већ додата у Гери.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Грешка ИМАП везе.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Нетачно корисничко име или лозинка ИМАП-а.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Грешка СМТП везе.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; Нетачно корисничко име или лозинка СМТП-а.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Грешка везе.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Нетачно корисничко име или лозинка.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Сачувај"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Додај"
+
+#. / 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 "%l:%M %P"
+
+#. / 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. %-l:%M %P"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Сада"
+
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "Пре %dm"
+msgstr[1] "Пре %dm"
+msgstr[2] "Пре %dm"
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "Пре %dh"
+msgstr[1] "Пре %dh"
+msgstr[2] "Пре %dh"
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Јуче"
+
+#. / 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
+msgid "%A"
+msgstr "%A"
+
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "бајта"
+
+#: ../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/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d порука"
+msgstr[1] "%d поруке"
+msgstr[2] "%d порука"
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d непрочитана"
+msgstr[1] "%d непрочитане"
+msgstr[2] "%d непрочитаних"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Пријемни сандучићи"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Тражим налог „%s“"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d резултат"
+msgstr[1] "%d резултата"
+msgstr[2] "%d резултата"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "Није изабран разговор."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "Изабран је %u разговор."
 msgstr[1] "Изабрана су %u разговора."
 msgstr[2] "Изабрано је %u разговора."
-msgstr[3] "Изабран је %u разговор."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:444
 msgid "No search results found."
@@ -1014,42 +1207,37 @@ msgid "Date:"
 msgstr "Датум:"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "%u нова порука"
 msgstr[1] "%u нове поруке"
 msgstr[2] "%u нових порука"
-msgstr[3] "%u нова порука"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr "Ова порука је успешно послата, али не може бити сачувана у „%s“."
 
-#. Add a menu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Умножи"
 
-#. Add a menu item for copying the address.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "Умножи адресу _е-поште"
 
-#. Add a menu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Умножи _везу"
 
-#. Select message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "Изабери _поруку"
 
-#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Изабери _све"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "_Провери"
@@ -1062,7 +1250,6 @@ msgstr "Ова веза изгледа као да води до"
 msgid "but actually goes to"
 msgstr "али заправо води до"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
 msgstr " (Неисправно?)"
@@ -1085,14 +1272,11 @@ msgid_plural "Save All A_ttachments..."
 msgstr[0] "Сачувај _прилог..."
 msgstr[1] "Сачувај _прилоге..."
 msgstr[2] "Сачувај _прилоге..."
-msgstr[3] "Сачувај _прилог..."
 
-#. Reply to all on a message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "Одговори _свима"
 
-#. Mark as read/unread.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "_Означи као прочитано"
@@ -1105,1084 +1289,629 @@ msgstr "_Означи као непрочитано"
 msgid "Mark Unread From _Here"
 msgstr "Означи као непрочитано _одавде"
 
-#. Separator.
-#. View original message source.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "_Погледај извор"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:378
-msgid "none"
-msgstr "ништа"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "Не могу да отворим подразумевани уредник текста."
 
 #: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s — Надзорник разговора"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Изаберите датотеку"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Сачувана"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Приложи"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Чувам"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
-msgid "Untrusted Connection: %s"
-msgstr "Неповерљива веза: %s"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Грешка приликом чувања"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
-msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr "Идентитет „%s“ сервера поште на „%s:%u“ не може бити проверен."
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "Притисните Backspace за брисање наводника"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
-msgid ""
-"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-"your username and password to be transmitted insecurely."
-msgstr ""
-"Ако изаберете „Веруј овом серверу“ или „Увек веруј овом серверу“ тада ваше "
-"корисничко име и лозинка могу да буду пренети несигурно."
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Нова порука"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-"server."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Ако изаберете „Не веруј овом серверу“ тада Гери неће приступити овом серверу."
+"прилог|прилогу|прилажем|атачмент|атачменту|attach|attaching|attaches|attachme"
+"nt|attachments|attached|enclose|enclosed|enclosing|encloses|enclosure|enclosu"
+"res|prilog|prilogu|prilažem|atačment|atačmentu"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
-msgid "Geary will not add or update this email account."
-msgstr "Гери неће додати или освежити овај налог е-поште."
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Да ли желите да одбаците ову поруку?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-"this account."
-msgstr ""
-"Ако изаберете „Не веруј овом серверу“ тада ће Гери зауставити приступање "
-"овом серверу."
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Да пошаљем поруку са празним насловом и текстом?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr "Гери ће изаћи ако немате других отворених налога е-поште."
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Да пошаљем поруку са празним насловом?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
-msgid ""
-"Contact your system administrator or email service provider if you have any "
-"question about these issues."
-msgstr ""
-"Обратите се вашем администратору система или достављачу услуге е-поште ако "
-"имате неко питање о овим проблемима."
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Да пошаљем поруку без икаквог текста?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
-msgstr "Уверење сервера није потписано од стране познатог издавача"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Да пошаљем поруку без прилога?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
-msgid "The server's identity does not match the identity in the certificate"
-msgstr "Идентитет сервера не одговара идентитету у уверењу"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Не могу да додам прилог"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
-msgid "The server's certificate has expired"
-msgstr "Уверење сервера је истекло"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "Не могу да пронађем „%s“."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
-msgid "The server's certificate has not been activated"
-msgstr "Уверење сервера није активирано"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "„%s“ је фасцикла."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
-msgid "The server's certificate has been revoked and is now invalid"
-msgstr "Уверење сервера је опозвано и сада је неисправно"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "„%s“ је празна датотека."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
-msgid "The server's certificate is considered insecure"
-msgstr "Уверење сервера се сматра несигурним"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "Не могу да отворим „%s“ за читање."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
-msgid "An error has occurred processing the server's certificate"
-msgstr "Дошло је до грешке приликом обраде уверења сервера"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "„%s“ је већ приложено за испоруку."
 
-#. 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 "Geary requires your email password to continue"
-msgstr "Гери захтева лозинку ваше е-поште да би наставио"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. 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 порука"
-msgstr[1] "%d поруке"
-msgstr[2] "%d порука"
-msgstr[3] "%d порука"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Прима: "
 
-#. / 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 непрочитана"
-msgstr[1] "%d непрочитане"
-msgstr[2] "%d непрочитаних"
-msgstr[3] "%d непрочитана"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Цц: "
 
-#. / 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/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Бцц: "
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Пријемни сандучићи"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "Одговор за: "
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d резултат"
-msgstr[1] "%d резултата"
-msgstr[2] "%d резултата"
-msgstr[3] "%d резултат"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Изаберите боју"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s — Нове поруке"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr "%1$s преко %2$s"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d нова порука"
-msgstr[1] "%d нове поруке"
-msgstr[2] "%d нових порука"
-msgstr[3] "%d нова порука"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_Шаље:"
 
-#: ../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 нова порука"
-msgstr[1] "%s, укупно %d нове поруке"
-msgstr[2] "%s, укупно %d нових порука"
-msgstr[3] "%s, укупно %d нова порука"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 друга нова порука за %s)"
-msgstr[1] ""
-"%s\n"
-"(%d друге нове поруке за %s)"
-msgstr[2] ""
-"%s\n"
-"(%d других нових порука за %s)"
-msgstr[3] ""
-"%s\n"
-"(%d друга нова порука за %s)"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Шаљем..."
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Отвори"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i резултат"
+msgstr[1] "%i резултата"
+msgstr[2] "%i резултата"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i резултат (умотано)"
+msgstr[1] "%i резултата (умотано)"
+msgstr[2] "%i резултата (умотано)"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "није нађено"
 
-#. / 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"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "У _реду"
 
-#. / 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."
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "От_кажи"
 
-#. / 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"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Затвори"
 
-#. / 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"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "Од_баци"
 
-#. / 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"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "От_вори"
 
-#. / 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"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Штампај..."
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Сада"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Уклони"
 
-#: ../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "Пре %dm"
-msgstr[1] "Пре %dm"
-msgstr[2] "Пре %dm"
-msgstr[3] "Пре %dm"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Задржи"
 
-#: ../src/client/util/util-date.vala:171
-#, c-format
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "Пре %dh"
-msgstr[1] "Пре %dh"
-msgstr[2] "Пре %dh"
-msgstr[3] "Пре %dh"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Потражите кључне речи у свим порукама у налогу (Ctrl+S)"
 
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "Јуче"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Пописујем налог „%s“"
 
-#. / 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"
+#~ msgid "Geary"
+#~ msgstr "Гери"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(без наслова)"
+#~ msgid "Geary Mail"
+#~ msgstr "Геријева пошта"
 
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "бајта"
+#~ msgid "Send and receive email"
+#~ msgstr "Шаље и прима е-пошту"
 
-#: ../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr ""
+#~ "пошта;електронска пошта;ел. пошта;е-пошта;pošta;elektronska pošta;el. pošta;"
 
-#: ../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#~ msgid "Compose Message"
+#~ msgstr "Нова порука"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#~ msgid "Send by email"
+#~ msgstr "Пошаљи е-поштом"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#~ msgid "Send files using Geary"
+#~ msgstr "Пошаљите датотеке помоћу Герија"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Гуглова пошта"
+#~ msgid "_Donate"
+#~ msgstr "До_бровољан прилог"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Јаху! пошта"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Не могу да уклоним налог</span> "
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Прозор састављача придружен овом налогу је тренутно отворен. Пошаљите или "
+#~ "одбаците поруку и покушајте поново."
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Друга"
+#~ msgid "Add account"
+#~ msgstr "Додај налог"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "ИМАП"
+#~ msgid "Edit account"
+#~ msgstr "Уреди налог"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "СМТП"
+#~ msgid "Remove account"
+#~ msgstr "Уклони налог"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Сандуче"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Сачекајте док Гери не потврди ваш налог."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Нацрти"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Неповерљива веза"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Послата пошта"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "_Увек веруј овом серверу"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Омиљена"
+#~ msgid "_Trust This Server"
+#~ msgstr "_Веруј овом серверу"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Важна"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "_Не веруј овом серверу"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Сва пошта"
+#~ msgid "_Undo"
+#~ msgstr "_Опозови"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Непожељна"
+#~ msgid "_Redo"
+#~ msgstr "_Понови"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Смеће"
+#~ msgid "Cu_t"
+#~ msgstr "_Исеци"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Одлазна"
+#~ msgid "_Paste"
+#~ msgstr "_Убаци"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Архива"
+#~ msgid "_Left"
+#~ msgstr "_Лево"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-msgstr "Ништа"
+#~ msgid "_Right"
+#~ msgstr "_Десно"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-msgid "attachment"
-msgstr "прилог"
+#~ msgid "_Center"
+#~ msgstr "По _средини"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
-msgstr "бцц"
+#~ msgid "_Justify"
+#~ msgstr "_Поравнај"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
-msgstr "текст поруке"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Веза (Ctrl+L)"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "cc"
-msgstr "цц"
+#~ msgid "C_olor"
+#~ msgstr "_Боја"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
-msgstr "шаље"
+#~ msgid "More options"
+#~ msgstr "Још могућности"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-msgid "subject"
-msgstr "наслов"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Цитирај текст  (Ctrl+])"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
-msgstr "прима"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Не цитирај текст (Ctrl+[)"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
-msgstr "моја"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Уклони форматирање (Ctrl+Размак)"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-msgid "Drafts | Draft"
-msgstr "Нацрти | Нацрт | Drafts | Draft"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Убаци _форматиран текст"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr ""
-"Послато | Послата пошта | Послата е-пошта | Sent | Sent Mail | Sent Email | "
-"Sent E-Mail"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Подебљано (Ctrl+B)"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-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"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Искошено (Ctrl+I)"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Смеће | Корпа | Trash | Rubbish | Rubbish Bin"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Подвучено (Ctrl+U)"
 
-#. / 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:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %-e. %b, %Y. у %-l:%M %p"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Прецртано (Ctrl+K)"
 
-#. / 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:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "%1$s, %2$s пише:"
+#~ msgid "_Rich Text"
+#~ msgstr "_Богат текст"
 
-#. / 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:228
-#, c-format
-msgid "%s wrote:"
-msgstr "%s пише:"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Прикажи проширена поља"
 
-#. / 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:234
-#, c-format
-msgid "On %s:"
-msgstr "%s:"
+#~ msgctxt "Label"
+#~ msgid "Close and Save"
+#~ msgstr "Затвори и сачувај"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Прослеђена порука ----------"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "Затвори и сачувај"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "Шаље: %s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "Затвори и сачувај"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Наслов: %s\n"
+#~ msgctxt "Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Затвори и одбаци"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "Датум: %s\n"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Затвори и одбаци"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "Прима: %s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "Затвори и одбаци"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Цц: %s\n"
+#~ msgid "Lar_ge"
+#~ msgstr "_Велики"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">Не могу да уклоним налог</span> "
+#~ msgid "Large"
+#~ msgstr "Велики"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Прозор састављача придружен овом налогу је тренутно отворен. Пошаљите или "
-"одбаците поруку и покушајте поново."
+#~ msgid "_Medium"
+#~ msgstr "_Средњи"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Додај налог"
+#~ msgid "Medium"
+#~ msgstr "Средњи"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Уреди налог"
+#~ msgid "_Small"
+#~ msgstr "_Мали"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Уклони налог"
+#~ msgid "Small"
+#~ msgstr "Мали"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Сачекајте док Гери не потврди ваш налог."
+#~ msgid "S_ans Serif"
+#~ msgstr "_Безсерифни"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Неповерљива веза"
+#~ msgid "Sans Serif"
+#~ msgstr "Безсерифни"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "_Увек веруј овом серверу"
+#~ msgid "S_erif"
+#~ msgstr "_Серифни"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "_Веруј овом серверу"
+#~ msgid "Serif"
+#~ msgstr "Серифни"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "_Не веруј овом серверу"
+#~ msgid "_Fixed Width"
+#~ msgstr "_Стална ширина"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Опозови"
-
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Понови"
-
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "_Исеци"
-
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "_Убаци"
-
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Лево"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Десно"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "По _средини"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Поравнај"
-
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Веза (Ctrl+L)"
-
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "_Боја"
-
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Још могућности"
-
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Цитирај текст  (Ctrl+])"
-
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Не цитирај текст (Ctrl+[)"
-
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Уклони форматирање (Ctrl+Размак)"
-
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Убаци _форматиран текст"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Подебљано (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Искошено (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Подвучено (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Прецртано (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "_Богат текст"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Прикажи проширена поља"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "Затвори и сачувај"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "Затвори и сачувај"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "Затвори и сачувај"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "Затвори и одбаци"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "Затвори и одбаци"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "Затвори и одбаци"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "_Велики"
-
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "Велики"
-
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "_Средњи"
-
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "Средњи"
-
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "_Мали"
-
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "Мали"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "_Безсерифни"
-
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "Безсерифни"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "_Серифни"
-
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "Серифни"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "_Стална ширина"
-
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "Стална ширина"
-
-#: ../ui/composer.glade.h:42
-msgid "Detach"
-msgstr "Откачи"
-
-#: ../ui/composer.glade.h:43
-#| msgid "Italic (Ctrl+I)"
-msgid "Detach (Ctrl+D)"
-msgstr "Откачи (Ctrl+D)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_Пошаљи"
-
-#: ../ui/composer.glade.h:45
-msgid "Send"
-msgstr "Пошаљи"
-
-#: ../ui/composer.glade.h:46
-#| msgid "Bold (Ctrl+B)"
-msgid "Send (Ctrl+Enter)"
-msgstr "Пошаљи (Ctrl+Enter)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "_Приложи датотеку"
-
-#: ../ui/composer.glade.h:48
-msgid "Attach File"
-msgstr "Прилаже датотеку"
-
-#: ../ui/composer.glade.h:49
-msgid "_Include Original Attachments"
-msgstr "_Укључи изворне прилоге"
-
-#: ../ui/composer.glade.h:50
-msgid "Include Original Attachments"
-msgstr "Укључује изворне прилоге"
-
-#: ../ui/composer.glade.h:51
-msgid "Application Menu"
-msgstr "Мени програма"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:53
-msgid "_To"
-msgstr "_Прима"
+#~ msgid "Fixed Width"
+#~ msgstr "Стална ширина"
 
-#: ../ui/composer.glade.h:54
-msgid "_Cc"
-msgstr "_Цц"
+#~ msgid "Detach"
+#~ msgstr "Откачи"
 
-#: ../ui/composer.glade.h:55
-msgid "_Subject"
-msgstr "_Наслов"
+#~| msgid "Italic (Ctrl+I)"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Откачи (Ctrl+D)"
 
-#: ../ui/composer.glade.h:56
-msgid "_Bcc"
-msgstr "_Бцц"
+#~ msgid "_Send"
+#~ msgstr "_Пошаљи"
 
-#: ../ui/composer.glade.h:57
-msgid "_Reply-To"
-msgstr "_Одговори"
+#~ msgid "Send"
+#~ msgstr "Пошаљи"
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:59
-msgid "From"
-msgstr "Шаље"
+#~| msgid "Bold (Ctrl+B)"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Пошаљи (Ctrl+Enter)"
 
-#: ../ui/composer.glade.h:60
-msgid "Drop files here"
-msgstr "Овде превуците датотеке"
+#~ msgid "_Attach File"
+#~ msgstr "_Приложи датотеку"
 
-#: ../ui/composer.glade.h:61
-msgid "To add them as attachments"
-msgstr "Да их додате као прилиге"
+#~ msgid "Attach File"
+#~ msgstr "Прилаже датотеку"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-#| msgid "E_mail address"
-msgid "Remove email address"
-msgstr "Уклони адресе е-поште"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Укључи изворне прилоге"
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"Неки сервиси за е-пошту захтевају подешавање додатне адресе на серверу.  "
-"Контактирајте издавача услуге за вашу е-пошту како би добили више података."
+#~ msgid "Include Original Attachments"
+#~ msgstr "Укључује изворне прилоге"
 
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "_Ажурирај"
+#~ msgid "Application Menu"
+#~ msgstr "Мени програма"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Нађи:"
+#~ msgid "_To"
+#~ msgstr "_Прима"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Претходна"
+#~ msgid "_Cc"
+#~ msgstr "_Цц"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Наредна"
+#~ msgid "_Subject"
+#~ msgstr "_Наслов"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "Разликуј _велика слова"
+#~ msgid "_Bcc"
+#~ msgstr "_Бцц"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "натпис"
+#~ msgid "_Reply-To"
+#~ msgstr "_Одговори"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Лозинка"
+#~ msgid "From"
+#~ msgstr "Шаље"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "Адресе _е-поште"
+#~ msgid "Drop files here"
+#~ msgstr "Овде превуците датотеке"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Лозинка"
+#~ msgid "To add them as attachments"
+#~ msgstr "Да их додате као прилиге"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "_Услуга"
+#~| msgid "E_mail address"
+#~ msgid "Remove email address"
+#~ msgstr "Уклони адресе е-поште"
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "_Име и презиме"
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "Неки сервиси за е-пошту захтевају подешавање додатне адресе на серверу.  "
+#~ "Контактирајте издавача услуге за вашу е-пошту како би добили више података."
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "_Назив налога"
+#~ msgid "_Update"
+#~ msgstr "_Ажурирај"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Посао, кућа, итд."
+#~ msgid "Find:"
+#~ msgstr "Нађи:"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_Сачувај послату пошту"
+#~ msgid "_Previous"
+#~ msgstr "_Претходна"
 
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
-msgstr "_Додатне адресе за е-пошту…"
+#~ msgid "_Next"
+#~ msgstr "_Наредна"
 
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "Подешавања за ИМАП"
+#~ msgid "_Case sensitive"
+#~ msgstr "Разликуј _велика слова"
 
-#: ../ui/login.glade.h:12
-msgid "Se_rver"
-msgstr "Се_рвер"
+#~ msgid "label"
+#~ msgstr "натпис"
 
-#: ../ui/login.glade.h:13
-msgid "P_ort"
-msgstr "_Порт"
+#~ msgid "Password"
+#~ msgstr "Лозинка"
 
-#: ../ui/login.glade.h:14
-msgid "Ser_ver"
-msgstr "Сер_вер"
+#~ msgid "E_mail address"
+#~ msgstr "Адресе _е-поште"
 
-#: ../ui/login.glade.h:15
-msgid "Por_t"
-msgstr "При_кључник"
+#~ msgid "_Password"
+#~ msgstr "_Лозинка"
 
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "Подешавања за СМТП"
+#~ msgid "S_ervice"
+#~ msgstr "_Услуга"
 
-#: ../ui/login.glade.h:17
-msgid "User_name"
-msgstr "_Корисник"
+#~ msgid "N_ame"
+#~ msgstr "_Име и презиме"
 
-#: ../ui/login.glade.h:18
-msgid "Pass_word"
-msgstr "_Лозинка"
+#~ msgid "N_ickname"
+#~ msgstr "_Назив налога"
 
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr "СМТП корисничко име"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Посао, кућа, итд."
 
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr "СМТП лозинка"
+#~ msgid "_Save sent mail"
+#~ msgstr "_Сачувај послату пошту"
 
-#: ../ui/login.glade.h:21
-msgid "_Username"
-msgstr "_Корисник"
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "_Додатне адресе за е-пошту…"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr "ИМАП корисничко име"
+#~ msgid "IMAP settings"
+#~ msgstr "Подешавања за ИМАП"
 
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr "ИМАП лозинка"
+#~ msgid "Se_rver"
+#~ msgstr "Се_рвер"
 
-#: ../ui/login.glade.h:24
-msgid "Encr_yption"
-msgstr "Ши_фровање"
+#~ msgid "P_ort"
+#~ msgstr "_Порт"
 
-#: ../ui/login.glade.h:25
-msgid "Encrypt_ion"
-msgstr "Шифро_вање"
+#~ msgid "Ser_ver"
+#~ msgstr "Сер_вер"
 
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr "ССЛ/ТЛС"
+#~ msgid "Por_t"
+#~ msgstr "При_кључник"
 
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "СТАРТТЛС"
+#~ msgid "SMTP settings"
+#~ msgstr "Подешавања за СМТП"
 
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "Није _потребно потврђивање идентитета"
+#~ msgid "User_name"
+#~ msgstr "_Корисник"
 
-#: ../ui/login.glade.h:30
-msgid "Use IMAP cre_dentials"
-msgstr "Користи ИМАП _уверења"
+#~ msgid "Pass_word"
+#~ msgstr "_Лозинка"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Састављач"
+#~ msgid "SMTP username"
+#~ msgstr "СМТП корисничко име"
 
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr "Сачувај _нацрте на серверу"
+#~ msgid "SMTP password"
+#~ msgstr "СМТП лозинка"
 
-#: ../ui/login.glade.h:33
-#| msgid "Si_gn emails:"
-msgid "Si_gn emails (HTML allowed):"
-msgstr "По_тпиши е-поруке (дозвољен је ХТМЛ):"
+#~ msgid "_Username"
+#~ msgstr "_Корисник"
 
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "Складиште"
+#~ msgid "IMAP username"
+#~ msgstr "ИМАП корисничко име"
 
-#: ../ui/login.glade.h:35
-msgid "_Download mail"
-msgstr "_Преузми пошту"
+#~ msgid "IMAP password"
+#~ msgstr "ИМАП лозинка"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "СМТП уверења"
+#~ msgid "Encr_yption"
+#~ msgstr "Ши_фровање"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "Корисник"
+#~ msgid "Encrypt_ion"
+#~ msgstr "Шифро_вање"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Запамти лозинку"
+#~ msgid "SSL/TLS"
+#~ msgstr "ССЛ/ТЛС"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Потврди идентитет"
+#~ msgid "STARTTLS"
+#~ msgstr "СТАРТТЛС"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Читање"
+#~ msgid "No authentication re_quired"
+#~ msgstr "Није _потребно потврђивање идентитета"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "_Сам изабери следећу поруку"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Користи ИМАП _уверења"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "_Прикажи преглед разговора"
+#~ msgid "Composer"
+#~ msgstr "Састављач"
 
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr "Приказ у _три површи"
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Сачувај _нацрте на серверу"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "Укључи _проверу писања"
+#~| msgid "Si_gn emails:"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "По_тпиши е-поруке (дозвољен је ХТМЛ):"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "Обавештења"
+#~ msgid "Storage"
+#~ msgstr "Складиште"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "_Пусти звуке обавештења"
+#~ msgid "_Download mail"
+#~ msgstr "_Преузми пошту"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "Прикажи _обавештења за нову пошту"
+#~ msgid "SMTP Credentials"
+#~ msgstr "СМТП уверења"
 
-#: ../ui/preferences.glade.h:10
-#| msgid "Show _notifications for new mail"
-msgid "Always _watch for new mail"
-msgstr "Увек _ослушкуј за нове поруке"
+#~ msgid "Username"
+#~ msgstr "Корисник"
 
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr "Гери ће радити у позадини и слати обавештења када дође нова е-порука"
+#~ msgid "_Remember password"
+#~ msgstr "_Запамти лозинку"
 
-#: ../ui/preferences.glade.h:12
-msgid "Preferences"
-msgstr "Поставке"
+#~ msgid "_Authenticate"
+#~ msgstr "_Потврди идентитет"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Да ли сигурно желите да уклоните овај "
-"налог?</span> "
+#~ msgid "Reading"
+#~ msgstr "Читање"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Сва е-пошта придружена овом налогу ће бити уклоњена с вашег рачунара. Ово "
-"неће утицати на пошту која се налази на серверу."
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Сам изабери следећу поруку"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Прикажи преглед разговора"
+
+#~ msgid "Use _three pane view"
+#~ msgstr "Приказ у _три површи"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Укључи _проверу писања"
+
+#~ msgid "Notifications"
+#~ msgstr "Обавештења"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Пусти звуке обавештења"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Прикажи _обавештења за нову пошту"
+
+#~| msgid "Show _notifications for new mail"
+#~ msgid "Always _watch for new mail"
+#~ msgstr "Увек _ослушкуј за нове поруке"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr "Гери ће радити у позадини и слати обавештења када дође нова е-порука"
+
+#~ msgid "Preferences"
+#~ msgstr "Поставке"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Да ли сигурно желите да уклоните овај "
+#~ "налог?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Сва е-пошта придружена овом налогу ће бити уклоњена с вашег рачунара. Ово "
+#~ "неће утицати на пошту која се налази на серверу."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Надимак:"
+#~ msgid "Nickname:"
+#~ msgstr "Надимак:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Адресе е-поште:"
+#~ msgid "Email address:"
+#~ msgstr "Адресе е-поште:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Ажурирање Герија је у току…"
+#~ msgid "Geary update in progress…"
+#~ msgstr "Ажурирање Герија је у току…"
 
 #~ msgid "_Delete"
 #~ msgstr "_Обриши"
@@ -2208,6 +1937,5 @@ msgstr "Ажурирање Герија је у току…"
 #~ msgid "attach|enclosed|enclosing|cover letter"
 #~ msgstr "прилог|приложено|прилажем|пропратно писмо"
 
-#~| msgid "_Close"
 #~ msgid "C_lose"
 #~ msgstr "_Затвори"
diff --git a/po/sr latin po b/po/sr latin po
index f0fc35b..e233f3b 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -7,424 +7,434 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=geary&k";
-"eywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-12-27 05:55+0000\n"
-"PO-Revision-Date: 2014-12-27 13:41+0200\n"
-"Last-Translator: Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:11+0000\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:56+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
 "X-Project-Style: gnome\n"
+"Language: sr\n"
 
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Zupčinko"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Program za el. poštu"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Zupčinkova pošta"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Šaljite i primajte poštu"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "pošta;elektronska pošta;el. pošta;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Sastavite poruku"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Pošaljite el. poštom"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Nacrti | Nacrt | Drafts | Draft"
 
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Pošaljite datoteke koristeći Zupčinka"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
+"Poslato | Poslata pošta | Poslata el. pošta | Sent | Sent Mail | Sent Email "
+"| Sent E-Mail"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Sačuvaj"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
+"Đubre | Spam | Nepoželjna | Nepoželjna pošta | Nepoželjna el. pošta | Junk | "
+"Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email | Bulk "
+"E-Mail"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Dodaj"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Smeće | Korpa | Trash | Rubbish | Rubbish Bin"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:20
-msgid "Accounts"
-msgstr "Nalozi"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#. Copyright 2011-2014 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Ime i prezime"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Sanduče"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-msgid "Welcome to Geary."
-msgstr "Dobro došli u Zupčinka."
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Nacrti"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-msgid "Enter your account information to get started."
-msgstr "Unesite podatke vašeg naloga da započnete."
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Poslata pošta"
 
-#: ../src/client/accounts/add-edit-page.vala:247
-msgid "2 weeks back"
-msgstr "2 nedelje unazad"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Omiljena"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:248
-msgid "1 month back"
-msgstr "1 mesec unazad"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Važna"
 
-#: ../src/client/accounts/add-edit-page.vala:249
-msgid "3 months back"
-msgstr "3 meseca unazad"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Sva pošta"
 
-#: ../src/client/accounts/add-edit-page.vala:250
-msgid "6 months back"
-msgstr "6 meseci unazad"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Nepoželjna"
 
-#: ../src/client/accounts/add-edit-page.vala:251
-msgid "1 year back"
-msgstr "1 godinu unazad"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Smeće"
 
-#: ../src/client/accounts/add-edit-page.vala:252
-msgid "2 years back"
-msgstr "2 godine unazad"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Odlazna"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "4 years back"
-msgstr "4 godine unazad"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Potraži"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "Everything"
-msgstr "Sve"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Arhiva"
 
-#: ../src/client/accounts/add-edit-page.vala:686
-msgid "Remem_ber passwords"
-msgstr "_Zapamti lozinke"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Ništa"
 
-#: ../src/client/accounts/add-edit-page.vala:693 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "_Zapamti lozinku"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:727
-msgid "Unable to validate:\n"
-msgstr "Ne mogu da potvrdim:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:729
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Neispravan nadimak naloga.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "G-pošta"
 
-#: ../src/client/accounts/add-edit-page.vala:732
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; Adresa el. pošte je već dodata Zupčinku.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Jahu! pošta"
 
-#: ../src/client/accounts/add-edit-page.vala:736
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; Greška IMAP veze.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Autluk.kom"
 
-#: ../src/client/accounts/add-edit-page.vala:739
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; Netačno korisničko ime ili lozinka IMAP-a.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Druga"
 
-#: ../src/client/accounts/add-edit-page.vala:742
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; Greška SMTP veze.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "prilog"
 
-#: ../src/client/accounts/add-edit-page.vala:745
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; Netačno korisničko ime ili lozinka SMTP-a.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "bcc"
 
-#: ../src/client/accounts/add-edit-page.vala:749
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Greška veze.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "razrada"
 
-#: ../src/client/accounts/add-edit-page.vala:753
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Netačno korisničko ime ili lozinka.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "cc"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2014 Yorba Foundation"
-msgstr "Autorska prava 2011-2014 Jorba Fondacija"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "šalje"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Posetite veb stranicu Jorbe"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "naslov"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Pokreće Zupčinka sa skrivenim glavnim prozorom"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "prima"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Ispisuje podatke pročišćavanja"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "moja"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Beleži nadgledanje razgovora"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(bez naslova)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Beleži deserijalizaciju mreže"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %-e. %b, %Y. u %-l:%M %p"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Beleži mrežnu aktivnost"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "%1$s, %2$s piše:"
 
-#. / 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 "Beleži red ponavljanja IMAP-a"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s piše:"
 
-#. / 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 "Beleži serijalizaciju mreže"
+#. / 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:234
+msgid "On %s:"
+msgstr "%s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Beleži povremenu aktivnost"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Prosleđena poruka ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Beleži upite baze podataka (pravi mnogo poruka)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Šalje: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Beleži normalizaciju fascikle"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Naslov: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Dopušta pregledanje Veb pregleda"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Datum: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Opoziva sva uverenja servera sa TLS upozorenjima"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Prima: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Prikazuje izdanje programa"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Cc: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Koristite „%s“ za otvaranje novog prozora sastavljača"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "ništa"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Molim prijative napomene, predloge i greške na:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Program za el. poštu"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Ne mogu da obradim opciju linije naredbi: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Nepoznata opcija linije naredbi: %s\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Posetite veb stranicu Jorbe"
 
-#: ../src/client/application/geary-controller.vala:56
-msgid "_Delete"
-msgstr "_Obriši"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Obrišite razgovor (Pomak+Obriši)"
 
-#: ../src/client/application/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Obrišite razgovore (Pomak+Obriši)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:62
-msgid "_Trash"
-msgstr "_Smeće"
-
-#: ../src/client/application/geary-controller.vala:63
-msgid "Move conversation to trash (Delete, Backspace)"
-msgstr "Premestite razgovor u smeće (Obriši, Povratnica)"
-
-#: ../src/client/application/geary-controller.vala:64
-msgid "Move conversations to trash (Delete, Backspace)"
-msgstr "Premestite razgovore u smeće (Obriši, Povratnica)"
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr ""
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
 #: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Arhiviraj"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Arhivirajte razgovor (A)"
 
-#: ../src/client/application/geary-controller.vala:70
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Arhivirajte razgovore (A)"
 
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Označi kao _nepoželjno"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Označi da nije _nepoželjno"
 
-#: ../src/client/application/geary-controller.vala:76
-#: ../src/client/application/geary-controller.vala:296
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Označite razgovor"
 
-#: ../src/client/application/geary-controller.vala:77
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Označite razgovore"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Dodajte natpis razgovoru"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Dodajte natpis razgovorima"
 
-#: ../src/client/application/geary-controller.vala:80
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Premestite razgovor"
 
-#: ../src/client/application/geary-controller.vala:81
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Premestite razgovore"
 
-#: ../src/client/application/geary-controller.vala:272
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "_Nalozi"
 
-#: ../src/client/application/geary-controller.vala:277
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Postavke"
 
-#: ../src/client/application/geary-controller.vala:281
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "Po_moć"
 
-#: ../src/client/application/geary-controller.vala:285
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/client/application/geary-controller.vala:289
-msgid "_Donate"
-msgstr "Do_brovoljan prilog"
-
-#: ../src/client/application/geary-controller.vala:293
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Izađi"
 
-#: ../src/client/application/geary-controller.vala:298
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Označi kao..."
 
-#: ../src/client/application/geary-controller.vala:304
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Označi kao _pročitano"
 
-#: ../src/client/application/geary-controller.vala:310
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Označi kao _nepročitano"
 
-#: ../src/client/application/geary-controller.vala:316
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Dodaj zvezdicu"
 
-#: ../src/client/application/geary-controller.vala:321
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "_Ukloni zvezdicu"
 
-#: ../src/client/application/geary-controller.vala:331
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Dodajte natpis"
 
-#: ../src/client/application/geary-controller.vala:332
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Natpis"
 
-#: ../src/client/application/geary-controller.vala:336
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Premesti"
 
-#: ../src/client/application/geary-controller.vala:340
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Sastavite novu poruku (Ktrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:344
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1751
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Odgovori"
 
-#: ../src/client/application/geary-controller.vala:345
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Odgovorite (Ktrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:349
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "Odgovori _svima"
 
-#: ../src/client/application/geary-controller.vala:350
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Odgovorite svima (Ktrl+Pomak+R, Pomak+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:355
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1761
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Prosledi"
 
-#: ../src/client/application/geary-controller.vala:356
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Prosledite (Ktrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:624
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Ne mogu da pričuvam izuzetak poverenja servera"
 
-#: ../src/client/application/geary-controller.vala:861
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Vaša podešavanja nisu bezbedna"
 
-#: ../src/client/application/geary-controller.vala:862
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -434,32 +444,30 @@ msgstr ""
 "korisničko ime i lozinku može da pročita neko drugi na mreži.  Da li sigurno "
 "želite da uradite to?"
 
-#: ../src/client/application/geary-controller.vala:863
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "_Nastavi"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:941
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Greška slanja el. pošte"
 
-#: ../src/client/application/geary-controller.vala:942
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
 msgstr ""
-"Zupčinko je naišao na grešku šaljući el. poštu.  Ako se problem ponovi, ručno "
-"izbrišite el. poštu iz vaše odlazne fascikle."
+"Zupčinko je naišao na grešku šaljući el. poštu.  Ako se problem ponovi, "
+"ručno izbrišite el. poštu iz vaše odlazne fascikle."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:946
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Greška čuvanja poslate pošte"
 
-#: ../src/client/application/geary-controller.vala:947
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -467,20 +475,15 @@ msgstr ""
 "Zupčinko je naišao na grešku čuvanja poslate poruke u „Poslato“.  Poruka će "
 "ostati u vašoj fascikli za slanje sve dok je ne izbrišete."
 
-#: ../src/client/application/geary-controller.vala:1016
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Natpisi"
 
-#. 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:1028
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Ne mogu da otvorim bazu podataka za „%s“"
 
-#: ../src/client/application/geary-controller.vala:1029
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -504,21 +507,19 @@ msgstr ""
 "Ponovna izgradnja baze podataka će uništiti svu mesnu el. poštu i njene "
 "priloge. <b>Pošta na vašem serveru će ostati netaknuta.</b>"
 
-#: ../src/client/application/geary-controller.vala:1031
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "Ponovo _izgradi"
 
-#: ../src/client/application/geary-controller.vala:1031
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "_Izađi"
 
-#: ../src/client/application/geary-controller.vala:1040
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Ne mogu ponovo da izgradim bazu podataka za „%s“"
 
-#: ../src/client/application/geary-controller.vala:1041
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -528,17 +529,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1063
-#: ../src/client/application/geary-controller.vala:1073
-#: ../src/client/application/geary-controller.vala:1084
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Ne mogu da otvorim mesno sanduče za „%s“"
 
-#: ../src/client/application/geary-controller.vala:1064
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -556,7 +553,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -570,7 +567,7 @@ msgstr ""
 "\n"
 "Instalirajte najnovije izdanje Zupčinka i pokušajte ponovo."
 
-#: ../src/client/application/geary-controller.vala:1085
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -582,26 +579,31 @@ msgstr ""
 "\n"
 "Proverite vašu mrežnu vezu i ponovo pokrenite Zupčinka."
 
-#: ../src/client/application/geary-controller.vala:1592
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "O programu „%s“"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1595
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
 msgstr ""
 "Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
 "\n"
-"http://prevod.org — prevod na srpski jezik"
+"http://prevod.org — prevod na srpski jezik\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Мирослав Николић https://launchpad.net/~lipek";
 
-#: ../src/client/application/geary-controller.vala:1859
-#, c-format
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Da li ste sigurni da želite da otvorite „%s“?"
 
-#: ../src/client/application/geary-controller.vala:1860
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -609,454 +611,192 @@ msgstr ""
 "Priložene datoteke mogu da oštete sistem ako se otvore. Otvorite datoteke "
 "samo sa poverljivih izvora."
 
-#: ../src/client/application/geary-controller.vala:1861
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Ne pitaj me _ponovo"
 
-#: ../src/client/application/geary-controller.vala:1879
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Datoteka pod nazivom „%s“ već postoji.  Da li želite da je zamenite?"
 
-#: ../src/client/application/geary-controller.vala:1881
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "Datoteka već postoji u „%s“.  Ukoliko je zamenite prepisaćete njen sadržaj."
 
-#: ../src/client/application/geary-controller.vala:1884
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Zameni"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2166
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Da zatvorim otvorene poruke nacrta?"
 
-#: ../src/client/application/geary-controller.vala:2269
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Da li želite trajno da obrišete ovu poruku?"
 msgstr[1] "Da li želite trajno da obrišete ove poruke?"
 msgstr[2] "Da li želite trajno da obrišete ove poruke?"
-msgstr[3] "Da li želite trajno da obrišete ovu poruku?"
 
-#: ../src/client/application/geary-controller.vala:2271
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Obriši"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i rezultat"
-msgstr[1] "%i rezultata"
-msgstr[2] "%i rezultata"
-msgstr[3] "%i rezultat"
-
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i rezultat (umotano)"
-msgstr[1] "%i rezultata (umotano)"
-msgstr[2] "%i rezultata (umotano)"
-msgstr[3] "%i rezultat (umotano)"
-
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "nisam našao"
-
-#: ../src/client/components/main-toolbar.vala:11
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Potraži"
-
-#. Search bar.
-#: ../src/client/components/main-toolbar.vala:78
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Potražite ključne reči u svim porukama u nalogu (Ktrl+S)"
-
-#: ../src/client/components/main-toolbar.vala:210
-#, c-format
-msgid "Indexing %s account"
-msgstr "Popisujem nalog „%s“"
-
-#: ../src/client/components/main-toolbar.vala:221
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Tražim nalog „%s“"
-
-#: ../src/client/components/main-window.vala:347
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Šaljem..."
-
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "U _redu"
-
-#: ../src/client/components/stock.vala:19 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "Ot_kaži"
-
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Zatvori"
-
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "Od_baci"
-
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "Ot_vori"
-
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Štampaj..."
-
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Ukloni"
-
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1218
-msgid "Select _All"
-msgstr "Izaberi _sve"
-
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Zadrži"
-
-#: ../src/client/composer/composer-widget.vala:58
-msgid "Saved"
-msgstr "Sačuvana"
-
-#: ../src/client/composer/composer-widget.vala:59
-msgid "Saving"
-msgstr "Čuvam"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:60
-msgid "Error saving"
-msgstr "Greška čuvanja"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
+msgstr ""
 
-#. A 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:121
-msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
 msgstr ""
-"priloži|prilaganje|prilog|prilozi|prilaganja|priložen|priložena|priloženo"
 
-#: ../src/client/composer/composer-widget.vala:907
-msgid "Do you want to discard the unsaved message?"
-msgstr "Da li želite da odbacite nesačuvanu poruku?"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Pokreće Zupčinka sa skrivenim glavnim prozorom"
 
-#: ../src/client/composer/composer-widget.vala:910
-#: ../src/client/composer/composer-widget.vala:914
-msgid "Do you want to discard this message?"
-msgstr "Da li želite da odbacite ovu poruku?"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Ispisuje podatke pročišćavanja"
 
-#: ../src/client/composer/composer-widget.vala:1027
-msgid "Send message with an empty subject and body?"
-msgstr "Da pošaljem poruku sa praznim naslovom i razradom?"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Beleži nadgledanje razgovora"
 
-#: ../src/client/composer/composer-widget.vala:1029
-msgid "Send message with an empty subject?"
-msgstr "Da pošaljem poruku sa praznim naslovom?"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Beleži deserijalizaciju mreže"
 
-#: ../src/client/composer/composer-widget.vala:1031
-msgid "Send message with an empty body?"
-msgstr "Da pošaljem poruku sa praznom razradom?"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Beleži mrežnu aktivnost"
 
-#: ../src/client/composer/composer-widget.vala:1033
-msgid "Send message without an attachment?"
-msgstr "Da pošaljem poruku bez priloga?"
+#. / 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 "Beleži red ponavljanja IMAP-a"
 
-#: ../src/client/composer/composer-widget.vala:1216
-msgid "Cannot add attachment"
-msgstr "Ne mogu da dodam prilog"
+#. / 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 "Beleži serijalizaciju mreže"
 
-#: ../src/client/composer/composer-widget.vala:1227
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "Ne mogu da pronađem „%s“."
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Beleži povremenu aktivnost"
 
-#: ../src/client/composer/composer-widget.vala:1234
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "„%s“ je fascikla."
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Beleži upite baze podataka (pravi mnogo poruka)"
 
-#: ../src/client/composer/composer-widget.vala:1241
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "„%s“ je prazna datoteka."
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Beleži normalizaciju fascikle"
 
-#: ../src/client/composer/composer-widget.vala:1255
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "Ne mogu da otvorim „%s“ za čitanje."
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Dopušta pregledanje Veb pregleda"
 
-#: ../src/client/composer/composer-widget.vala:1262
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "„%s“ je već priloženo za isporuku."
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Opoziva sva uverenja servera sa TLS upozorenjima"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1271
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Prikazuje izdanje programa"
 
-#: ../src/client/composer/composer-widget.vala:1331
-msgid "To: "
-msgstr "Prima: "
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Koristite „%s“ za otvaranje novog prozora sastavljača"
 
-#: ../src/client/composer/composer-widget.vala:1334
-msgid "Cc: "
-msgstr "Uu: "
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Molim prijative napomene, predloge i greške na:"
 
-#: ../src/client/composer/composer-widget.vala:1337
-msgid "Bcc: "
-msgstr "Nuu: "
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Ne mogu da obradim opciju linije naredbi: %s\n"
 
-#: ../src/client/composer/composer-widget.vala:1340
-#| msgid "_Reply"
-msgid "Reply-To: "
-msgstr "Odgovori: "
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Nepoznata opcija linije naredbi: %s\n"
 
-#: ../src/client/composer/composer-widget.vala:1573
-msgid "Select Color"
-msgstr "Izaberite boju"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s — Nove poruke"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2022
-msgid "_From:"
-msgstr "_Šalje:"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d nova poruka"
+msgstr[1] "%d nove poruke"
+msgstr[2] "%d novih poruka"
 
-#. For other types of messages, just show the from account.
-#. Composer label (without mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2038
-#: ../src/client/conversation-viewer/conversation-viewer.vala:734
-msgid "From:"
-msgstr "Šalje:"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, ukupno %d nova poruka"
+msgstr[1] "%s, ukupno %d nove poruke"
+msgstr[2] "%s, ukupno %d novih poruka"
 
-#. Copyright 2011-2014 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Window for sending messages.
-#: ../src/client/composer/composer-window.vala:10
-msgid "New Message"
-msgstr "Nova poruka"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d druga nova poruka za %s)"
+msgstr[1] ""
+"%s\n"
+"(%d druge nove poruke za %s)"
+msgstr[2] ""
+"%s\n"
+"(%d drugih novih poruka za %s)"
+
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Otvori"
 
 #: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Ja"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:338
-msgid "No conversations selected."
-msgstr "Nema izabranih razgovora."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:340
-#, c-format
-msgid "%u conversation selected."
-msgid_plural "%u conversations selected."
-msgstr[0] "%u razgovor je izabran."
-msgstr[1] "%u razgovora su izabrana."
-msgstr[2] "%u razgovora je izabrano."
-msgstr[3] "%u razgovor je izabran."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:369
-msgid "No search results found."
-msgstr "Nema rezultata pretrage."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:371
-msgid "No conversations in folder."
-msgstr "Nema razgovora u fascikli."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:633
-msgid "This message contains remote images."
-msgstr "Ova poruka sadrži udaljene slike."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:633
-msgid "Show Images"
-msgstr "Prikažite slike"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:634
-msgid "Always Show From Sender"
-msgstr "Uvek prikaži od pošiljaoca"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:658
-msgid "Edit Draft"
-msgstr "Uredite nacrt"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:737
-msgid "To:"
-msgstr "Prima:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:740
-msgid "Cc:"
-msgstr "Cc:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:743
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:746
-msgid "Subject:"
-msgstr "Naslov:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:749
-msgid "Date:"
-msgstr "Datum:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1033
-#, c-format
-msgid "%u read message"
-msgid_plural "%u read messages"
-msgstr[0] "%u nova poruka"
-msgstr[1] "%u nove poruke"
-msgstr[2] "%u novih poruka"
-msgstr[3] "%u nova poruka"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1165
-#, c-format
-msgid "This message was sent successfully, but could not be saved to %s."
-msgstr "Ova poruka je uspešno poslata, ali ne može biti sačuvana u „%s“."
-
-#. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1191
-#: ../ui/composer.glade.h:4
-msgid "_Copy"
-msgstr "_Umnoži"
-
-#. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1199
-msgid "Copy _Email Address"
-msgstr "Umnoži adresu _el. pošte"
-
-#. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1204
-#: ../ui/composer.glade.h:17
-msgid "Copy _Link"
-msgstr "Umnoži _vezu"
-
-#. Select message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1212
-msgid "Select _Message"
-msgstr "Izaberi _poruku"
-
-#. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1224
-msgid "_Inspect"
-msgstr "_Proveri"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1450
-msgid "This link appears to go to"
-msgstr "Ova veza izgleda kao da vodi do"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1451
-msgid "but actually goes to"
-msgstr "ali zapravo vodi do"
-
-#. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1506
-msgid " (Invalid?)"
-msgstr " (Neispravno?)"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
-msgid "_Save Image As..."
-msgstr "_Sačuvaj sliku kao..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1716
-msgid "_Save As..."
-msgstr "_Sačuvaj kao..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1721
-msgid "Save All A_ttachments..."
-msgstr "Sačuvaj sve _priloge..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1741
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "Sačuvaj _prilog..."
-msgstr[1] "Sačuvaj _priloge..."
-msgstr[2] "Sačuvaj _priloge..."
-msgstr[3] "Sačuvaj _prilog..."
-
-#. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1756
-msgid "Reply to _All"
-msgstr "Odgovori _svima"
-
-#. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1773
-msgid "_Mark as Read"
-msgstr "_Označi kao pročitano"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1777
-msgid "_Mark as Unread"
-msgstr "_Označi kao nepročitano"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1783
-msgid "Mark Unread From _Here"
-msgstr "Označi kao nepročitano _odavde"
-
-#. Separator.
-#. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1798
-msgid "_View Source"
-msgstr "_Pogledaj izvor"
-
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2122
-#: ../src/engine/rfc822/rfc822-utils.vala:331
-msgid "none"
-msgstr "ništa"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2257
-msgid "Failed to open default text editor."
-msgstr "Nisam uspeo da otvorim osnovnog uređivača teksta."
-
-#: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s — Nadzornik razgovora"
-
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Izaberite datoteku"
-
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Priloži"
-
 #: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
 msgid "Untrusted Connection: %s"
 msgstr "Nepoverljiva veza: %s"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
 msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr "Identitet „%s“ servera pošte na „%s:%u“ ne može biti proveren."
 
@@ -1085,8 +825,8 @@ msgid ""
 "Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
 "this account."
 msgstr ""
-"Ako izaberete „Ne veruj ovom serveru“ tada će Zupčinko zaustaviti pristupanje "
-"ovom serveru."
+"Ako izaberete „Ne veruj ovom serveru“ tada će Zupčinko zaustaviti "
+"pristupanje ovom serveru."
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:61
 msgid "Geary will exit if you have no other open email accounts."
@@ -1097,8 +837,8 @@ msgid ""
 "Contact your system administrator or email service provider if you have any "
 "question about these issues."
 msgstr ""
-"Obratite se vašem administratoru sistema ili dostavljaču usluge el. pošte ako "
-"imate neko pitanje o ovim problemima."
+"Obratite se vašem administratoru sistema ili dostavljaču usluge el. pošte "
+"ako imate neko pitanje o ovim problemima."
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:73
 msgid "The server's certificate is not signed by a known authority"
@@ -1128,101 +868,132 @@ msgstr "Uverenje servera se smatra nesigurnim"
 msgid "An error has occurred processing the server's certificate"
 msgstr "Došlo je do greške prilikom obrade uverenja servera"
 
-#. 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 "Geary requires your email password to continue"
 msgstr "Zupčinko zahteva vašu lozinku el. pošte da bi nastavio"
 
-#. 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 poruka"
-msgstr[1] "%d poruke"
-msgstr[2] "%d poruka"
-msgstr[3] "%d poruka"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Izaberite datoteku"
 
-#. / 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 nepročitana"
-msgstr[1] "%d nepročitane"
-msgstr[2] "%d nepročitanih"
-msgstr[3] "%d nepročitana"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Priloži"
 
-#. / 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/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr ""
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Sanduče"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Nalozi"
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d rezultat"
-msgstr[1] "%d rezultata"
-msgstr[2] "%d rezultata"
-msgstr[3] "%d rezultat"
+#. / 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 "Ime i prezime"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s — Nove poruke"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Dobro došli u Zupčinka."
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d nova poruka"
-msgstr[1] "%d nove poruke"
-msgstr[2] "%d novih poruka"
-msgstr[3] "%d nova poruka"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Unesite podatke vašeg naloga da započnete."
 
-#: ../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] "%s, ukupno %d nova poruka"
-msgstr[1] "%s, ukupno %d nove poruke"
-msgstr[2] "%s, ukupno %d novih poruka"
-msgstr[3] "%s, ukupno %d nova poruka"
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 nedelje unazad"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 druga nova poruka za %s)"
-msgstr[1] ""
-"%s\n"
-"(%d druge nove poruke za %s)"
-msgstr[2] ""
-"%s\n"
-"(%d drugih novih poruka za %s)"
-msgstr[3] ""
-"%s\n"
-"(%d druga nova poruka za %s)"
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 mesec unazad"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Otvori"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 meseca unazad"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 meseci unazad"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 godinu unazad"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "2 godine unazad"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "4 godine unazad"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Sve"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "_Zapamti lozinke"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "_Zapamti lozinku"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Ne mogu da potvrdim:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Neispravan nadimak naloga.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Adresa el. pošte je već dodata Zupčinku.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Greška IMAP veze.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Netačno korisničko ime ili lozinka IMAP-a.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Greška SMTP veze.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; Netačno korisničko ime ili lozinka SMTP-a.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Greška veze.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Netačno korisničko ime ili lozinka.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Sačuvaj"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Dodaj"
 
 #. / 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
@@ -1280,22 +1051,18 @@ msgid "Now"
 msgstr "Sada"
 
 #: ../src/client/util/util-date.vala:167
-#, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
 msgstr[0] "Pre %dm"
 msgstr[1] "Pre %dm"
 msgstr[2] "Pre %dm"
-msgstr[3] "Pre %dm"
 
 #: ../src/client/util/util-date.vala:171
-#, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
 msgstr[0] "Pre %dh"
 msgstr[1] "Pre %dh"
 msgstr[2] "Pre %dh"
-msgstr[3] "Pre %dh"
 
 #: ../src/client/util/util-date.vala:178
 msgid "Yesterday"
@@ -1304,15 +1071,9 @@ msgstr "Juče"
 #. / 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:30
-#: ../src/engine/rfc822/rfc822-message.vala:747
-msgid "(no subject)"
-msgstr "(bez naslova)"
-
 #: ../src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "bajta"
@@ -1337,693 +1098,765 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KB"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d poruka"
+msgstr[1] "%d poruke"
+msgstr[2] "%d poruka"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d nepročitana"
+msgstr[1] "%d nepročitane"
+msgstr[2] "%d nepročitanih"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "G-pošta"
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Jahu! pošta"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Sanduče"
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Autluk.kom"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Tražim nalog „%s“"
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Druga"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d rezultat"
+msgstr[1] "%d rezultata"
+msgstr[2] "%d rezultata"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Sanduče"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "Nema izabranih razgovora."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Nacrti"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] "%u razgovor je izabran."
+msgstr[1] "%u razgovora su izabrana."
+msgstr[2] "%u razgovora je izabrano."
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Poslata pošta"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
+msgstr "Nema rezultata pretrage."
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Omiljena"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
+msgstr "Nema razgovora u fascikli."
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Važna"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
+msgstr "Ova poruka sadrži udaljene slike."
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Sva pošta"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr "Prikažite slike"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Nepoželjna"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
+msgstr "Uvek prikaži od pošiljaoca"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Smeće"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
+msgstr "Uredite nacrt"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Odlazna"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "Šalje:"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Arhiva"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "Prima:"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:25
-msgid "None"
-msgstr "Ništa"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Cc:"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:665
-msgid "attachment"
-msgstr "prilog"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Bcc:"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:669
-#: ../src/engine/imap-db/imap-db-account.vala:693
-msgid "bcc"
-msgstr "bcc"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "Naslov:"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:673
-msgid "body"
-msgstr "razrada"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Datum:"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:677
-#: ../src/engine/imap-db/imap-db-account.vala:693
-msgid "cc"
-msgstr "cc"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] "%u nova poruka"
+msgstr[1] "%u nove poruke"
+msgstr[2] "%u novih poruka"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:681
-#: ../src/engine/imap-db/imap-db-account.vala:693
-msgid "from"
-msgstr "šalje"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
+msgstr "Ova poruka je uspešno poslata, ali ne može biti sačuvana u „%s“."
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:685
-msgid "subject"
-msgstr "naslov"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "_Umnoži"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:689
-#: ../src/engine/imap-db/imap-db-account.vala:693
-msgid "to"
-msgstr "prima"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "Umnoži adresu _el. pošte"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:709
-msgid "me"
-msgstr "moja"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "Umnoži _vezu"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:536
-msgid "Drafts | Draft"
-msgstr "Nacrti | Nacrt | Drafts | Draft"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
+msgstr "Izaberi _poruku"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:541
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Izaberi _sve"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "_Proveri"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr "Ova veza izgleda kao da vodi do"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
+msgstr "ali zapravo vodi do"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
+msgstr " (Neispravno?)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
+msgstr "_Sačuvaj sliku kao..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_Sačuvaj kao..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "Sačuvaj sve _priloge..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] "Sačuvaj _prilog..."
+msgstr[1] "Sačuvaj _priloge..."
+msgstr[2] "Sačuvaj _priloge..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "Odgovori _svima"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "_Označi kao pročitano"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "_Označi kao nepročitano"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
+msgstr "Označi kao nepročitano _odavde"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "_Pogledaj izvor"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "Nisam uspeo da otvorim osnovnog uređivača teksta."
+
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr "%s — Nadzornik razgovora"
+
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Sačuvana"
+
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Čuvam"
+
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Greška čuvanja"
+
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
 msgstr ""
-"Poslato | Poslata pošta | Poslata el. pošta | Sent | Sent Mail | Sent Email "
-"| Sent E-Mail"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:546
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Nova poruka"
+
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Đubre | Spam | Nepoželjna | Nepoželjna pošta | Nepoželjna el. pošta | Junk | "
-"Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email | Bulk "
-"E-Mail"
+"priloži|prilaganje|prilog|prilozi|prilaganja|priložen|priložena|priloženo"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:551
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Smeće | Korpa | Trash | Rubbish | Rubbish Bin"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Da li želite da odbacite ovu poruku?"
 
-#. / 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:168
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %-e. %b, %Y. u %-l:%M %p"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Da pošaljem poruku sa praznim naslovom i razradom?"
 
-#. / 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:174
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "%1$s, %2$s piše:"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Da pošaljem poruku sa praznim naslovom?"
 
-#. / 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:181
-#, c-format
-msgid "%s wrote:"
-msgstr "%s piše:"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Da pošaljem poruku sa praznom razradom?"
 
-#. / 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:187
-#, c-format
-msgid "On %s:"
-msgstr "%s:"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Da pošaljem poruku bez priloga?"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:216
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Prosleđena poruka ----------"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Ne mogu da dodam prilog"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "From: %s\n"
-msgstr "Šalje: %s\n"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "Ne mogu da pronađem „%s“."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:221
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Naslov: %s\n"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "„%s“ je fascikla."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:222
-#, c-format
-msgid "Date: %s\n"
-msgstr "Datum: %s\n"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "„%s“ je prazna datoteka."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:225
-#, c-format
-msgid "To: %s\n"
-msgstr "Prima: %s\n"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "Ne mogu da otvorim „%s“ za čitanje."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:228
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Cc: %s\n"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "„%s“ je već priloženo za isporuku."
+
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">Ne mogu da uklonim nalog</span> "
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Prima: "
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Uu: "
+
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Nuu: "
+
+#: ../src/client/composer/composer-widget.vala:1654
+#| msgid "_Reply"
+msgid "Reply-To: "
+msgstr "Odgovori: "
+
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Izaberite boju"
+
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
 msgstr ""
-"Prozor sastavljača pridružen ovom nalogu je trenutno otvoren. Pošaljite ili "
-"odbacite poruku i pokušajte ponovo."
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Dodajte nalog"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_Šalje:"
+
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Šaljem..."
+
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i rezultat"
+msgstr[1] "%i rezultata"
+msgstr[2] "%i rezultata"
+
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i rezultat (umotano)"
+msgstr[1] "%i rezultata (umotano)"
+msgstr[2] "%i rezultata (umotano)"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Uredite nalog"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "nisam našao"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Uklonite nalog"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "U _redu"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Sačekajte dok Zupčinko ne potvrdi vaš nalog."
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "Ot_kaži"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Nepoverljiva veza"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Zatvori"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "_Uvek veruj ovom serveru"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "Od_baci"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "_Veruj ovom serveru"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "Ot_vori"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "_Ne veruj ovom serveru"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Štampaj..."
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Opozovi"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Ukloni"
 
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Ponovi"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Zadrži"
 
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "_Iseci"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Potražite ključne reči u svim porukama u nalogu (Ktrl+S)"
 
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "_Ubaci"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Popisujem nalog „%s“"
 
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Levo"
+#~ msgid "Geary"
+#~ msgstr "Zupčinko"
 
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Desno"
+#~ msgid "Geary Mail"
+#~ msgstr "Zupčinkova pošta"
 
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "Po _sredini"
+#~ msgid "Send and receive email"
+#~ msgstr "Šaljite i primajte poštu"
 
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Poravnaj"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "pošta;elektronska pošta;el. pošta;"
 
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Veza (Ktrl+L)"
+#~ msgid "Compose Message"
+#~ msgstr "Sastavite poruku"
 
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "_Boja"
+#~ msgid "Send by email"
+#~ msgstr "Pošaljite el. poštom"
 
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Još mogućnosti"
+#~ msgid "Send files using Geary"
+#~ msgstr "Pošaljite datoteke koristeći Zupčinka"
 
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Citiraj tekst  (Ktrl+])"
+#~ msgid "Copyright 2011-2014 Yorba Foundation"
+#~ msgstr "Autorska prava 2011-2014 Jorba Fondacija"
 
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Odcitiraj tekst (Ktrl+[)"
+#~ msgid "_Delete"
+#~ msgstr "_Obriši"
 
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Ukloni oblikovanje (Ktrl+Razmak)"
+#~ msgid "_Trash"
+#~ msgstr "_Smeće"
 
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Ubaci _sa oblikovanjem"
+#~ msgid "Move conversation to trash (Delete, Backspace)"
+#~ msgstr "Premestite razgovor u smeće (Obriši, Povratnica)"
 
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Podebljaj (Ktrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Iskosi (Ktrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Podvuci (Ktrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Precrtaj (Ktrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "_Obogati tekst"
+#~ msgid "Move conversations to trash (Delete, Backspace)"
+#~ msgstr "Premestite razgovore u smeće (Obriši, Povratnica)"
 
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Prikaži proširena polja"
+#~ msgid "_Donate"
+#~ msgstr "Do_brovoljan prilog"
 
-#: ../ui/composer.glade.h:24
-msgid "Lar_ge"
-msgstr "_Veliki"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Da li želite da odbacite nesačuvanu poruku?"
 
-#: ../ui/composer.glade.h:25
-msgid "Large"
-msgstr "Veliki"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Ne mogu da uklonim nalog</span> "
 
-#: ../ui/composer.glade.h:26
-msgid "_Medium"
-msgstr "_Srednji"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Prozor sastavljača pridružen ovom nalogu je trenutno otvoren. Pošaljite ili "
+#~ "odbacite poruku i pokušajte ponovo."
 
-#: ../ui/composer.glade.h:27
-msgid "Medium"
-msgstr "Srednji"
+#~ msgid "Add account"
+#~ msgstr "Dodajte nalog"
 
-#: ../ui/composer.glade.h:28
-msgid "_Small"
-msgstr "_Mali"
+#~ msgid "Edit account"
+#~ msgstr "Uredite nalog"
 
-#: ../ui/composer.glade.h:29
-msgid "Small"
-msgstr "Mali"
+#~ msgid "Remove account"
+#~ msgstr "Uklonite nalog"
 
-#: ../ui/composer.glade.h:30
-msgid "S_ans Serif"
-msgstr "_Bezserifni"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Sačekajte dok Zupčinko ne potvrdi vaš nalog."
 
-#: ../ui/composer.glade.h:31
-msgid "Sans Serif"
-msgstr "Bezserifni"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Nepoverljiva veza"
 
-#: ../ui/composer.glade.h:32
-msgid "S_erif"
-msgstr "_Serifni"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "_Uvek veruj ovom serveru"
 
-#: ../ui/composer.glade.h:33
-msgid "Serif"
-msgstr "Serifni"
+#~ msgid "_Trust This Server"
+#~ msgstr "_Veruj ovom serveru"
 
-#: ../ui/composer.glade.h:34
-msgid "_Fixed Width"
-msgstr "_Stalna širina"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "_Ne veruj ovom serveru"
 
-#: ../ui/composer.glade.h:35
-msgid "Fixed Width"
-msgstr "Stalna širina"
+#~ msgid "_Undo"
+#~ msgstr "_Opozovi"
 
-#: ../ui/composer.glade.h:36
-msgid "Detach"
-msgstr "Otkači"
+#~ msgid "_Redo"
+#~ msgstr "_Ponovi"
 
-#: ../ui/composer.glade.h:37
-msgid "_Send"
-msgstr "_Pošalji"
+#~ msgid "Cu_t"
+#~ msgstr "_Iseci"
 
-#: ../ui/composer.glade.h:38
-msgid "Send"
-msgstr "Pošalji"
+#~ msgid "_Paste"
+#~ msgstr "_Ubaci"
 
-#: ../ui/composer.glade.h:39
-msgid "_Attach File"
-msgstr "_Priloži datoteku"
+#~ msgid "_Left"
+#~ msgstr "_Levo"
 
-#: ../ui/composer.glade.h:40
-msgid "Attach File"
-msgstr "Priložite datoteku"
+#~ msgid "_Right"
+#~ msgstr "_Desno"
 
-#: ../ui/composer.glade.h:41
-msgid "_Include Original Attachments"
-msgstr "_Uključi izvorne priloge"
+#~ msgid "_Center"
+#~ msgstr "Po _sredini"
 
-#: ../ui/composer.glade.h:42
-msgid "Include Original Attachments"
-msgstr "Uključite izvorne priloge"
+#~ msgid "_Justify"
+#~ msgstr "_Poravnaj"
 
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:44
-msgid "_To"
-msgstr "_Prima"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Veza (Ktrl+L)"
 
-#: ../ui/composer.glade.h:45
-msgid "_Cc"
-msgstr "_Uu"
+#~ msgid "C_olor"
+#~ msgstr "_Boja"
 
-#: ../ui/composer.glade.h:46
-msgid "_Subject"
-msgstr "_Tema"
+#~ msgid "More options"
+#~ msgstr "Još mogućnosti"
 
-#: ../ui/composer.glade.h:47
-msgid "_Bcc"
-msgstr "_Nuu"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Citiraj tekst  (Ktrl+])"
 
-#: ../ui/composer.glade.h:48
-#| msgid "_Reply"
-msgid "_Reply-To"
-msgstr "_Odgovori"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Odcitiraj tekst (Ktrl+[)"
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:50
-msgid "From"
-msgstr "Šalje"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Ukloni oblikovanje (Ktrl+Razmak)"
 
-#: ../ui/composer.glade.h:51
-msgid "Drop files here"
-msgstr "Ovde ubacite datoteke"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Ubaci _sa oblikovanjem"
 
-#: ../ui/composer.glade.h:52
-msgid "To add them as attachments"
-msgstr "Da ih dodate kao prilige"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Podebljaj (Ktrl+B)"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Nađi:"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Iskosi (Ktrl+I)"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Prethodna"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Podvuci (Ktrl+U)"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Naredna"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Precrtaj (Ktrl+K)"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "Razlikuj _veličinu slova"
+#~ msgid "_Rich Text"
+#~ msgstr "_Obogati tekst"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "natpis"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Prikaži proširena polja"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Lozinka"
+#~ msgid "Lar_ge"
+#~ msgstr "_Veliki"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "Adresa el. _pošte"
+#~ msgid "Large"
+#~ msgstr "Veliki"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Lozinka"
+#~ msgid "_Medium"
+#~ msgstr "_Srednji"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "_Usluga"
+#~ msgid "Medium"
+#~ msgstr "Srednji"
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "_Ime"
+#~ msgid "_Small"
+#~ msgstr "_Mali"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "_Nadimak"
+#~ msgid "Small"
+#~ msgstr "Mali"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Posao, kuća, itd."
+#~ msgid "S_ans Serif"
+#~ msgstr "_Bezserifni"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_Sačuvaj poslatu poštu"
+#~ msgid "Sans Serif"
+#~ msgstr "Bezserifni"
 
-#: ../ui/login.glade.h:10
-msgid "IMAP settings"
-msgstr "Podešavanja IMAP-a"
+#~ msgid "S_erif"
+#~ msgstr "_Serifni"
 
-#: ../ui/login.glade.h:11
-msgid "Se_rver"
-msgstr "Se_rver"
+#~ msgid "Serif"
+#~ msgstr "Serifni"
 
-#: ../ui/login.glade.h:12
-msgid "P_ort"
-msgstr "_Priključnik"
+#~ msgid "_Fixed Width"
+#~ msgstr "_Stalna širina"
 
-#: ../ui/login.glade.h:13
-msgid "Ser_ver"
-msgstr "Ser_ver"
+#~ msgid "Fixed Width"
+#~ msgstr "Stalna širina"
 
-#: ../ui/login.glade.h:14
-msgid "Por_t"
-msgstr "Pri_ključnik"
+#~ msgid "Detach"
+#~ msgstr "Otkači"
 
-#: ../ui/login.glade.h:15
-msgid "SMTP settings"
-msgstr "Podešavanja SMTP-a"
+#~ msgid "_Send"
+#~ msgstr "_Pošalji"
 
-#: ../ui/login.glade.h:16
-msgid "User_name"
-msgstr "_Korisnik"
+#~ msgid "Send"
+#~ msgstr "Pošalji"
 
-#: ../ui/login.glade.h:17
-msgid "Pass_word"
-msgstr "_Lozinka"
+#~ msgid "_Attach File"
+#~ msgstr "_Priloži datoteku"
 
-#: ../ui/login.glade.h:18
-msgid "SMTP username"
-msgstr "SMTP korisničko ime"
-
-#: ../ui/login.glade.h:19
-msgid "SMTP password"
-msgstr "SMTP lozinka"
+#~ msgid "Attach File"
+#~ msgstr "Priložite datoteku"
 
-#: ../ui/login.glade.h:20
-msgid "_Username"
-msgstr "_Korisnik"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Uključi izvorne priloge"
 
-#: ../ui/login.glade.h:21
-msgid "IMAP username"
-msgstr "IMAP korisničko ime"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Uključite izvorne priloge"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP password"
-msgstr "IMAP lozinka"
+#~ msgid "_To"
+#~ msgstr "_Prima"
 
-#: ../ui/login.glade.h:23
-msgid "Encr_yption"
-msgstr "Ši_frovanje"
+#~ msgid "_Cc"
+#~ msgstr "_Uu"
 
-#: ../ui/login.glade.h:24
-msgid "Encrypt_ion"
-msgstr "Šifro_vanje"
+#~ msgid "_Subject"
+#~ msgstr "_Tema"
 
-#: ../ui/login.glade.h:26
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "_Bcc"
+#~ msgstr "_Nuu"
 
-#: ../ui/login.glade.h:27
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~| msgid "_Reply"
+#~ msgid "_Reply-To"
+#~ msgstr "_Odgovori"
 
-#: ../ui/login.glade.h:28
-msgid "No authentication re_quired"
-msgstr "Nije _potrebno potvrđivanje identiteta"
+#~ msgid "From"
+#~ msgstr "Šalje"
 
-#: ../ui/login.glade.h:29
-msgid "Use IMAP cre_dentials"
-msgstr "Koristi IMAP _uverenja"
+#~ msgid "Drop files here"
+#~ msgstr "Ovde ubacite datoteke"
 
-#: ../ui/login.glade.h:30
-msgid "Storage"
-msgstr "Skladište"
+#~ msgid "To add them as attachments"
+#~ msgstr "Da ih dodate kao prilige"
 
-#: ../ui/login.glade.h:31
-msgid "_Download mail"
-msgstr "_Preuzmi poštu"
+#~ msgid "Find:"
+#~ msgstr "Nađi:"
 
-#: ../ui/login.glade.h:32 ../ui/preferences.glade.h:4
-msgid "Composer"
-msgstr "Sastavljač"
+#~ msgid "_Previous"
+#~ msgstr "_Prethodna"
 
-#: ../ui/login.glade.h:33
-msgid "Save dra_fts on server"
-msgstr "Sačuvaj _nacrte na serveru"
+#~ msgid "_Next"
+#~ msgstr "_Naredna"
 
-#: ../ui/login.glade.h:34
-msgid "Si_gn emails:"
-msgstr "Potpiši el. _poštu:"
+#~ msgid "_Case sensitive"
+#~ msgstr "Razlikuj _veličinu slova"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "SMTP uverenja"
+#~ msgid "label"
+#~ msgstr "natpis"
 
-#: ../ui/password-dialog.glade.h:2
-#| msgid "_Username"
-msgid "Username"
-msgstr "Korisnik"
+#~ msgid "Password"
+#~ msgstr "Lozinka"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Zapamti lozinku"
+#~ msgid "E_mail address"
+#~ msgstr "Adresa el. _pošte"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Potvrdi identitet"
+#~ msgid "_Password"
+#~ msgstr "_Lozinka"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Čitanje"
+#~ msgid "S_ervice"
+#~ msgstr "_Usluga"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "_Sam izaberi sledeću poruku"
+#~ msgid "N_ame"
+#~ msgstr "_Ime"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "_Prikaži pregled razgovora"
+#~ msgid "N_ickname"
+#~ msgstr "_Nadimak"
 
-#: ../ui/preferences.glade.h:5
-msgid "Enable _spell checking"
-msgstr "Uključi _proveru pisanja"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Posao, kuća, itd."
 
-#: ../ui/preferences.glade.h:6
-msgid "Notifications"
-msgstr "Obaveštenja"
+#~ msgid "_Save sent mail"
+#~ msgstr "_Sačuvaj poslatu poštu"
 
-#: ../ui/preferences.glade.h:7
-msgid "_Play notification sounds"
-msgstr "_Pusti zvuke obaveštenja"
+#~ msgid "IMAP settings"
+#~ msgstr "Podešavanja IMAP-a"
 
-#: ../ui/preferences.glade.h:8
-msgid "Show _notifications for new mail"
-msgstr "Prikaži _obaveštenja za novu poštu"
+#~ msgid "Se_rver"
+#~ msgstr "Se_rver"
 
-#: ../ui/preferences.glade.h:9
-msgid "Notify of new mail at start_up"
-msgstr "Obavesti o _novoj pošti pri pokretanju"
+#~ msgid "P_ort"
+#~ msgstr "_Priključnik"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Da li sigurno želite da uklonite ovaj "
-"nalog?</span> "
+#~ msgid "Ser_ver"
+#~ msgstr "Ser_ver"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Sva el. pošta pridružena ovom nalogu će biti uklonjena sa vašeg računara. Ovo "
-"neće uticati na poštu koja se nalazi na serveru."
+#~ msgid "Por_t"
+#~ msgstr "Pri_ključnik"
+
+#~ msgid "SMTP settings"
+#~ msgstr "Podešavanja SMTP-a"
+
+#~ msgid "User_name"
+#~ msgstr "_Korisnik"
+
+#~ msgid "Pass_word"
+#~ msgstr "_Lozinka"
+
+#~ msgid "SMTP username"
+#~ msgstr "SMTP korisničko ime"
+
+#~ msgid "SMTP password"
+#~ msgstr "SMTP lozinka"
+
+#~ msgid "_Username"
+#~ msgstr "_Korisnik"
+
+#~ msgid "IMAP username"
+#~ msgstr "IMAP korisničko ime"
+
+#~ msgid "IMAP password"
+#~ msgstr "IMAP lozinka"
+
+#~ msgid "Encr_yption"
+#~ msgstr "Ši_frovanje"
+
+#~ msgid "Encrypt_ion"
+#~ msgstr "Šifro_vanje"
+
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
+
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
+
+#~ msgid "No authentication re_quired"
+#~ msgstr "Nije _potrebno potvrđivanje identiteta"
+
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Koristi IMAP _uverenja"
+
+#~ msgid "Storage"
+#~ msgstr "Skladište"
+
+#~ msgid "_Download mail"
+#~ msgstr "_Preuzmi poštu"
+
+#~ msgid "Composer"
+#~ msgstr "Sastavljač"
+
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Sačuvaj _nacrte na serveru"
+
+#~ msgid "Si_gn emails:"
+#~ msgstr "Potpiši el. _poštu:"
+
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP uverenja"
+
+#~| msgid "_Username"
+#~ msgid "Username"
+#~ msgstr "Korisnik"
+
+#~ msgid "_Remember password"
+#~ msgstr "_Zapamti lozinku"
+
+#~ msgid "_Authenticate"
+#~ msgstr "_Potvrdi identitet"
+
+#~ msgid "Reading"
+#~ msgstr "Čitanje"
+
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Sam izaberi sledeću poruku"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Prikaži pregled razgovora"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Uključi _proveru pisanja"
+
+#~ msgid "Notifications"
+#~ msgstr "Obaveštenja"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Pusti zvuke obaveštenja"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Prikaži _obaveštenja za novu poštu"
+
+#~ msgid "Notify of new mail at start_up"
+#~ msgstr "Obavesti o _novoj pošti pri pokretanju"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Da li sigurno želite da uklonite ovaj "
+#~ "nalog?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Sva el. pošta pridružena ovom nalogu će biti uklonjena sa vašeg računara. "
+#~ "Ovo neće uticati na poštu koja se nalazi na serveru."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Nadimak:"
+#~ msgid "Nickname:"
+#~ msgstr "Nadimak:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Adresa el. pošte:"
+#~ msgid "Email address:"
+#~ msgstr "Adresa el. pošte:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-#| msgid "Geary upgrade in progress."
-msgid "Geary update in progress…"
-msgstr "Dogradnja Zupčinka je u toku…"
+#~| msgid "Geary upgrade in progress."
+#~ msgid "Geary update in progress…"
+#~ msgstr "Dogradnja Zupčinka je u toku…"
 
 #~ msgid "Please enter your password"
 #~ msgstr "Molim unesite vašu lizinku"
@@ -2034,13 +1867,11 @@ msgstr "Dogradnja Zupčinka je u toku…"
 #~ msgid "Password:"
 #~ msgstr "Lozinka:"
 
-#~| msgid "_Preferences"
 #~ msgid "Preferences"
 #~ msgstr "Postavke"
 
 #~ msgid "attach|enclosed|enclosing|cover letter"
 #~ msgstr "prilog|priloženo|prilažem|propratno pismo"
 
-#~| msgid "_Close"
 #~ msgid "C_lose"
 #~ msgstr "_Zatvori"
diff --git a/po/sv.po b/po/sv.po
index 037f338..a2cd0f1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -15,454 +15,430 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.5.2\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-08-21 17:14+0000\n"
-"PO-Revision-Date: 2015-08-22 09:41+0100\n"
-"Last-Translator: Josef Andersson <josef andersson fripost org>\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:12+0000\n"
+"Last-Translator: Josef Andersson <Unknown>\n"
 "Language-Team: Svenska <tp-sv listor tp-sv se>\n"
-"Language: sv\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: Poedit 1.7.5\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "E-postklient"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary Mail"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Skicka och ta emot e-post"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Mail;Epost;E-Post;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Skriv meddelande"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "Skicka som e-post"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Skicka filer med Geary"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Spara"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:56+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: sv\n"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Lägg till"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Utkast | Drafts | Draft"
 
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "Ytterligare adresser för %s"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
+"Skickat | Skickade brev | Sent | Sent Mail | Sent Email | Sent E-Mail"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Konton"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
+"Skräppost | Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | "
+"Bulk Email | Bulk E-Mail"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Förnamn Efternamn"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Papperskorg | Papperskorgen | Trash | Rubbish | Rubbish Bin"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Welcome to Geary."
-msgstr "Välkommen till Geary."
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr "Arkiv | Archive | Archives"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Enter your account information to get started."
-msgstr "Fyll i din kontoinformation för att komma igång."
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Inkorg"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "2 weeks back"
-msgstr "två veckor tillbaka"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Utkast"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "1 month back"
-msgstr "en månad tillbaka"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Skickad e-post"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "3 months back"
-msgstr "tre månader tillbaka"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Viktig"
 
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "6 months back"
-msgstr "ett halvår tillbaka"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Viktigt"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "1 year back"
-msgstr "ett år tillbaka"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Alla brev"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-msgid "2 years back"
-msgstr "2 år tillbaka"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Skräppost"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-msgid "4 years back"
-msgstr "4 år tillbaka"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Papperskorg"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "Everything"
-msgstr "Allt"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Utkorg"
 
-#: ../src/client/accounts/add-edit-page.vala:280
-msgid "Edit"
-msgstr "Redigera"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Sök"
 
-#: ../src/client/accounts/add-edit-page.vala:282
-msgid "Preview"
-msgstr "Förhandsgranska"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Arkiv"
 
-#: ../src/client/accounts/add-edit-page.vala:723
-msgid "Remem_ber passwords"
-msgstr "_Kom ihåg lösenord"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Ingen"
 
-#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "_Kom ihåg lösenord"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:764
-msgid "Unable to validate:\n"
-msgstr "Kan inte bekräfta:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:766
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Ogiltigt konto-alias.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:769
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; E-postadress redan tillagd i Geary.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:773
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP-anslutningsfel.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:776
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; Felaktigt IMAP-användarnamn eller -lösenord.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Annan"
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP-anslutningsfel.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "bilaga"
 
-#: ../src/client/accounts/add-edit-page.vala:782
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; Felaktigt SMTP-användarnamn eller -lösenord.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "bcc"
 
-#: ../src/client/accounts/add-edit-page.vala:786
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Anslutningsfel.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "innehåll"
 
-#: ../src/client/accounts/add-edit-page.vala:790
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Felaktigt användarnamn eller lösenord.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "cc"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011-2015 Yorba Foundation"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "från"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Besök Yorbas webbplats"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "ämne"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Starta Geary med huvudfönstret dolt"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "till"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Skriv ut felsökningsinformation"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "mig"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Logga konversationsövervakning"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(inget ämne)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Logga avserialisering av nätverksdata"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a %x klockan %H:%M %z"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Logga nätverksaktivitet"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "%1$s skrev %2$s:"
 
-#. / 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 "Logga IMAP-händelser"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s skrev:"
 
-#. / 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 "Logga nätverksserialisering"
+#. / 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:234
+msgid "On %s:"
+msgstr "%s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Logga periodisk aktivitet"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Vidarebefordrat meddelande ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Logga databasförfrågningar (detta genererar många meddelanden)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Från: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Logga mappsynkronisering"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Ämne: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Tillåt inspektion av WebView"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Datum: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Återkalla alla servercertifikat med TLS-varningar"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Till: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Visa programversion"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Cc: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Använd %s för att öppna ett nytt redigerarfönster"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "inget"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Rapportera fel, eller kom med förslag och kommentarer, på:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "E-postklient"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Kunde ej tyda kommandoradsalternativ: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "Copyright 2011-2015 Yorba Foundation"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Felaktigt kommandoradsalternativ: \"%s\"\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Besök Yorbas webbplats"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:61
 msgid "Delete conversation"
 msgstr "Radera konversation"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Radera konversationen (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Radera konversationerna (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:67
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "Flytta konversationen till papperskorgen (Delete, Backsteg)"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:68
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "Flytta konversationerna till papperskorgen (Delete, Backsteg)"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Arkivera"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Arkivera konversationen (A)"
 
-#: ../src/client/application/geary-controller.vala:75
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Arkivera konversationerna (A)"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Markera som skrä_ppost"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Markera som icke skrä_ppost"
 
-#: ../src/client/application/geary-controller.vala:81
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Markera konversation"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Markera konversationer"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Lägg till en etikett till konversationen"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Lägg till etiketter till konversationerna"
 
-#: ../src/client/application/geary-controller.vala:85
-#: ../src/client/application/geary-controller.vala:436
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Flytta konversationen"
 
-#: ../src/client/application/geary-controller.vala:86
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Flytta konversationerna"
 
-#: ../src/client/application/geary-controller.vala:373
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "_Konton"
 
-#: ../src/client/application/geary-controller.vala:378
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Inställningar"
 
-#: ../src/client/application/geary-controller.vala:382
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../src/client/application/geary-controller.vala:386
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/client/application/geary-controller.vala:390
-msgid "_Donate"
-msgstr "_Donera"
-
-#: ../src/client/application/geary-controller.vala:394
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Avsluta"
 
-#: ../src/client/application/geary-controller.vala:399
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Markera som…"
 
-#: ../src/client/application/geary-controller.vala:405
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Markera som _läst"
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Markera som _oläst"
 
-#: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "Markera som _viktigt"
 
-#: ../src/client/application/geary-controller.vala:422
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "Markera som ov_iktigt"
 
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Lägg till etikett"
 
-#: ../src/client/application/geary-controller.vala:433
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "Tilldela _etikett"
 
-#: ../src/client/application/geary-controller.vala:437
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Flytta"
 
-#: ../src/client/application/geary-controller.vala:441
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Skriv nytt meddelande (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:445
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "Sva_ra"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Svara (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:450
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "Svara _alla"
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Svara alla (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Vidarebefordra (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:496
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr "Töm"
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr "Töm skräp- eller papperskorgar"
 
-#: ../src/client/application/geary-controller.vala:501
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr "Töm _skräpkorg…"
 
-#: ../src/client/application/geary-controller.vala:505
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr "_Töm papperskorg…"
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:538
+#: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
 msgstr "Växla visning av sökrad"
 
-#: ../src/client/application/geary-controller.vala:752
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Kan inte lagra undantag för tillit till server"
 
-#: ../src/client/application/geary-controller.vala:989
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Dina inställningar är osäkra"
 
-#: ../src/client/application/geary-controller.vala:990
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -472,32 +448,30 @@ msgstr ""
 "Detta innebär att ditt användarnamn och lösenord kan avläsas av någon annan "
 "på nätverket. Är du säker på att du vill göra detta?"
 
-#: ../src/client/application/geary-controller.vala:991
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "_Fortsätt"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Misslyckades med att skicka e-post"
 
-#: ../src/client/application/geary-controller.vala:1070
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
 msgstr ""
 "Geary råkade ut för ett fel vid skickande av e-post.  Om problemen kvarstår "
-"kan du manuellt ta bort e-postmeddelandet från din utkorg. "
+"kan du manuellt ta bort e-postmeddelandet från din utkorg."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Misslyckades med att spara skickat e-postmeddelande"
 
-#: ../src/client/application/geary-controller.vala:1075
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -506,20 +480,15 @@ msgstr ""
 "till \"Skickad e-post\". Meddelandet kommer att ligga kvar i utkorgen tills "
 "du tar bort det."
 
-#: ../src/client/application/geary-controller.vala:1144
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Etiketter"
 
-#. 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:1156
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Kunde inte öppna databasen för %s"
 
-#: ../src/client/application/geary-controller.vala:1157
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -541,21 +510,19 @@ msgstr ""
 "Att bygga om databasen medför att alla lokala e-postmeddelanden och bifogade "
 "filer förstörs. <b>E-post på din server är inte berörda av felet.</b>"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "_Bygg om"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "_Avsluta"
 
-#: ../src/client/application/geary-controller.vala:1168
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Kunde inte bygga om databasen för ”%s”"
 
-#: ../src/client/application/geary-controller.vala:1169
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -565,17 +532,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1191
-#: ../src/client/application/geary-controller.vala:1201
-#: ../src/client/application/geary-controller.vala:1212
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Kunde inte öppna lokal brevlåda för %s"
 
-#: ../src/client/application/geary-controller.vala:1192
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -593,7 +556,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1202
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -606,9 +569,9 @@ msgstr ""
 "Tyvärr kan databasen inte återställas att fungera med denna version av "
 "Geary.\n"
 "\n"
-"Vänligen installera den senaste versionen av Geary och försök igen. "
+"Vänligen installera den senaste versionen av Geary och försök igen."
 
-#: ../src/client/application/geary-controller.vala:1213
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -618,34 +581,35 @@ msgstr ""
 "Det uppstod ett fel när det lokala kontot öppnades. Detta beror förmodligen "
 "på problem med anslutningen. \n"
 "\n"
-"Vänligen kontrollera din nätverksanslutning och starta om Geary. "
+"Vänligen kontrollera din nätverksanslutning och starta om Geary."
 
-#: ../src/client/application/geary-controller.vala:1721
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "Om %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1724
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
 msgstr ""
 "Joachim Johansson <joachim j gmail com>\n"
 "Mattias Eriksson <snaggen gmail com>\n"
 "\n"
 "Skicka synpunkter på översättningen till\n"
-"<tp-sv listor tp-sv se>."
+"<tp-sv listor tp-sv se>.\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Josef Andersson https://launchpad.net/~northar";
 
-#: ../src/client/application/geary-controller.vala:1990
+#: ../src/client/application/geary-controller.vala:1976
 msgid "Undo move (Ctrl+Z)"
 msgstr "Ångra förflyttning (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2000
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Är du säker på att du vill öppna ”%s”?"
 
-#: ../src/client/application/geary-controller.vala:2001
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -653,299 +617,527 @@ msgstr ""
 "Om du öppnar bifogade filer kan du skada ditt system. Öppna enbart filer "
 "från kontakter du litar på."
 
-#: ../src/client/application/geary-controller.vala:2002
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Fråga _inte igen"
 
-#: ../src/client/application/geary-controller.vala:2020
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "En fil med namnet ”%s” finns redan. Vill du ersätta den?"
 
-#: ../src/client/application/geary-controller.vala:2022
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "Filen finns redan i ”%s”. Att ersätta den kommer att skriva över dess "
 "innehåll."
 
-#: ../src/client/application/geary-controller.vala:2025
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "E_rsätt"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2323
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Stänga öppna utkast?"
 
-#: ../src/client/application/geary-controller.vala:2453
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr "Ta bort alla e-postmeddelanden från din mapp %s?"
 
-#: ../src/client/application/geary-controller.vala:2454
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr "Detta tar bort e-postmeddelanden från Geary och din e-postserver."
 
-#: ../src/client/application/geary-controller.vala:2455
+#: ../src/client/application/geary-controller.vala:2441
 msgid "This cannot be undone."
 msgstr "Detta kan inte ångras."
 
-#: ../src/client/application/geary-controller.vala:2456
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr "Töm %s"
 
-#: ../src/client/application/geary-controller.vala:2473
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 msgid "Error emptying %s"
 msgstr "Fel vid tömning av %s"
 
-#: ../src/client/application/geary-controller.vala:2503
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Vill du radera detta meddelande permanent?"
 msgstr[1] "Vill du radera dessa meddelanden permanent?"
 
-#: ../src/client/application/geary-controller.vala:2505
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Radera"
 
-#: ../src/client/application/geary-controller.vala:2536
+#: ../src/client/application/geary-controller.vala:2522
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Ångra arkivering (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2551
+#: ../src/client/application/geary-controller.vala:2537
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Ångra flytt till papperskorgen (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2604
+#: ../src/client/application/geary-controller.vala:2590
 msgid "Undo (Ctrl+Z)"
 msgstr "Ångra (Ctrl+Z)"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i träff"
-msgstr[1] "%i träffar"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Starta Geary med huvudfönstret dolt"
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i träff (från början)"
-msgstr[1] "%i träffar (från början)"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Skriv ut felsökningsinformation"
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "ingen sökträff"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Logga konversationsövervakning"
 
-#: ../src/client/components/main-window.vala:430
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Logga avserialisering av nätverksdata"
 
-#: ../src/client/components/search-bar.vala:10
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Sök"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Logga nätverksaktivitet"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:25
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Sök i all e-post i alla konton efter nyckelord (Ctrl+S)"
+#. / 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 "Logga IMAP-händelser"
 
-#: ../src/client/components/search-bar.vala:118
-#, c-format
-msgid "Indexing %s account"
-msgstr "Indexerar %s konto"
+#. / 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 "Logga nätverksserialisering"
 
-#: ../src/client/components/search-bar.vala:129
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Sök i konto %s"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Logga periodisk aktivitet"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Skickar…"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Logga databasförfrågningar (detta genererar många meddelanden)"
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_OK"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Logga mappsynkronisering"
 
-#: ../src/client/components/stock.vala:19
-#: ../ui/edit_alternate_emails.glade.h:3 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Avbryt"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Tillåt inspektion av WebView"
 
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Stäng"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Återkalla alla servercertifikat med TLS-varningar"
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Förkasta"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Visa programversion"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Öppna"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Använd %s för att öppna ett nytt redigerarfönster"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Skriv ut…"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Rapportera fel, eller kom med förslag och kommentarer, på:"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Ta bort"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Kunde ej tyda kommandoradsalternativ: %s\n"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "Välj _alla"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Felaktigt kommandoradsalternativ: \"%s\"\n"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Behåll"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Nya meddelanden"
 
-#: ../src/client/composer/composer-widget.vala:73
-msgid "Saved"
-msgstr "Sparat"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d nytt meddelande"
+msgstr[1] "%d nya meddelanden"
 
-#: ../src/client/composer/composer-widget.vala:74
-msgid "Saving"
-msgstr "Sparar"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d nytt meddelande totalt"
+msgstr[1] "%s, %d nya meddelanden totalt"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "Error saving"
-msgstr "Misslyckades med att spara"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d annat nytt meddelande för %s)"
+msgstr[1] ""
+"%s\n"
+"(%d andra nya meddelanden för %s)"
 
-#: ../src/client/composer/composer-widget.vala:76
-msgid "Press Backspace to delete quote"
-msgstr "Tryck på Backsteg för att ta bort citat"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Öppna"
 
-#: ../src/client/composer/composer-widget.vala:77
-msgid "New Message"
-msgstr "Nytt meddelande"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Jag"
 
-#. A 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:138
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr "Opålitlig anslutning: %s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr "Identiteten för e-postservern %s på %s:%u kunde inte verifieras."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
 msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
-"bifoga|bifogar|bifogat|inkludera|inkluderar|inkluderat|bilaga|bilagor|"
-"skickar med|medföljande|attachment"
+"Val av ”Lita på denna server” eller ”Lita alltid på denna server” kan orsaka "
+"att ditt användarnamn och lösenord skickas på ett osäkert sätt."
 
-#: ../src/client/composer/composer-widget.vala:1102
-#: ../src/client/composer/composer-widget.vala:1106
-msgid "Do you want to discard this message?"
-msgstr "Vill du förkasta detta meddelande?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"Val av ”Lita inte på denna server” innebär att Geary inte kommer åt denna "
+"server."
 
-#: ../src/client/composer/composer-widget.vala:1262
-msgid "Send message with an empty subject and body?"
-msgstr "Skicka meddelande med en tom ämnesrad och utan innehåll?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Geary kommer inte att lägga till eller uppdatera detta e-postkonto"
 
-#: ../src/client/composer/composer-widget.vala:1264
-msgid "Send message with an empty subject?"
-msgstr "Skicka meddelande med en tom ämnesrad?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+"Val av ”Lita inte på denna server” innebär att Geary kommer att sluta "
+"använda detta konto."
 
-#: ../src/client/composer/composer-widget.vala:1266
-msgid "Send message with an empty body?"
-msgstr "Skicka meddelande utan innehåll?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr "Geary kommer att avsluta om du inte har andra e-postkonton öppna."
 
-#: ../src/client/composer/composer-widget.vala:1268
-msgid "Send message without an attachment?"
-msgstr "Skicka meddelande utan att bifoga filer?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+"Kontakta din systemadministratör eller leverantören för e-posttjänsten om du "
+"har frågor kring dessa problem."
 
-#: ../src/client/composer/composer-widget.vala:1530
-msgid "Cannot add attachment"
-msgstr "Kan inte bifoga din fil"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr "Serverns certifikat är inte signerat av en känd utfärdare"
 
-#: ../src/client/composer/composer-widget.vala:1541
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "\"%s\" kunde inte hittas."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr ""
+"Serverns identitet överensstämmer inte med identiteten i certifikatet"
 
-#: ../src/client/composer/composer-widget.vala:1548
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "”%s” är en mapp."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Serverns certifikat har gått ut"
 
-#: ../src/client/composer/composer-widget.vala:1555
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "”%s” är en tom fil."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "Serverns certifikat har inte aktiverats"
 
-#: ../src/client/composer/composer-widget.vala:1569
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "”%s” kunde inte öppnas."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "Serverns certifikat har återkallats och är nu ogiltigt"
 
-#: ../src/client/composer/composer-widget.vala:1576
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "”%s” är redan bifogad och kommer att skickas."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "Serverns certifikat är betraktat som osäkert"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1585
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr "Ett fel har uppstått när serverns certifikat hanterades"
 
-#: ../src/client/composer/composer-widget.vala:1645
-msgid "To: "
-msgstr "Till: "
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr "Geary kräver ditt e-postlösenord för att fortsätta"
 
-#: ../src/client/composer/composer-widget.vala:1648
-msgid "Cc: "
-msgstr "Cc: "
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Välj en fil"
 
-#: ../src/client/composer/composer-widget.vala:1651
-msgid "Bcc: "
-msgstr "Bcc: "
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Bifoga"
 
-#: ../src/client/composer/composer-widget.vala:1654
-msgid "Reply-To: "
-msgstr "Svara-till: "
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr "Ytterligare adresser för %s"
 
-#: ../src/client/composer/composer-widget.vala:1887
-msgid "Select Color"
-msgstr "Välj färg"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Konton"
 
-#. 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:2322
-#, c-format
-msgid "%1$s via %2$s"
-msgstr "%1$s via %2$s"
+#. / 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 "Förnamn Efternamn"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2364
-msgid "_From:"
-msgstr "_Från:"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Välkommen till Geary."
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Jag"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Fyll i din kontoinformation för att komma igång."
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "två veckor tillbaka"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "en månad tillbaka"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "tre månader tillbaka"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "ett halvår tillbaka"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "ett år tillbaka"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "2 år tillbaka"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "4 år tillbaka"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Allt"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "Redigera"
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr "Förhandsgranska"
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "_Kom ihåg lösenord"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "_Kom ihåg lösenord"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Kan inte bekräfta:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Ogiltigt konto-alias.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; E-postadress redan tillagd i Geary.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; IMAP-anslutningsfel.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Felaktigt IMAP-användarnamn eller -lösenord.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; SMTP-anslutningsfel.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; Felaktigt SMTP-användarnamn eller -lösenord.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Anslutningsfel.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Felaktigt användarnamn eller lösenord.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Spara"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Lägg till"
+
+#. / 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 "%l:%M %P"
+
+#. / 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 "%b %-e"
+
+#. / 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 "%B %-e, %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 "%B %-e, %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 "%B %-e, %Y %-l:%M %P"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Nu"
+
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "%dm sedan"
+msgstr[1] "%dm sedan"
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "%dh sedan"
+msgstr[1] "%dh sedan"
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Igår"
+
+#. / 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
+msgid "%A"
+msgstr "%A"
+
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "byte"
+
+#: ../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/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d meddelande"
+msgstr[1] "%d meddelanden"
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d oläst"
+msgstr[1] "%d olästa"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Inkorgar"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Sök i konto %s"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d resultat"
+msgstr[1] "%d resultat"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "Inga valda konversationer."
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "%u konversation markerad."
@@ -1000,40 +1192,36 @@ msgid "Date:"
 msgstr "Datum:"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "%u läst meddelande"
 msgstr[1] "%u lästa meddelanden"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr "Detta meddelande har skickats, men kunde inte sparas till %s."
 
-#. Add a menu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#. Add a menu item for copying the address.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "Kopiera _e-postadress"
 
-#. Add a menu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Kopiera _länk"
 
-#. Select message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "_Markera meddelande"
 
-#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Välj _alla"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "_Inspektera"
@@ -1046,10 +1234,9 @@ msgstr "Denna länk ser ut att gå till"
 msgid "but actually goes to"
 msgstr "men går egentligen till"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
-msgstr "(Ogiltig?)"
+msgstr " (Ogiltig?)"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1718
 msgid "_Save Image As..."
@@ -1069,12 +1256,10 @@ msgid_plural "Save All A_ttachments..."
 msgstr[0] "Spara b_ifogad fil…"
 msgstr[1] "Spara alla b_ifogade filer…"
 
-#. Reply to all on a message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#. Mark as read/unread.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "Markera som _läst"
@@ -1087,1062 +1272,617 @@ msgstr "Markera som _oläst"
 msgid "Mark Unread From _Here"
 msgstr "Markera olästa _härifrån"
 
-#. Separator.
-#. View original message source.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "_Visa källa"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:378
-msgid "none"
-msgstr "inget"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "Det gick inte att öppna standardtextredigeraren."
 
 #: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s - Konversationsöversikt"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Välj en fil"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Sparat"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Bifoga"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Sparar"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
-msgid "Untrusted Connection: %s"
-msgstr "Opålitlig anslutning: %s"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Misslyckades med att spara"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
-msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr "Identiteten för e-postservern %s på %s:%u kunde inte verifieras."
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "Tryck på Backsteg för att ta bort citat"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
-msgid ""
-"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-"your username and password to be transmitted insecurely."
-msgstr ""
-"Val av ”Lita på denna server” eller ”Lita alltid på denna server” kan orsaka "
-"att ditt användarnamn och lösenord skickas på ett osäkert sätt."
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Nytt meddelande"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-"server."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Val av ”Lita inte på denna server” innebär att Geary inte kommer åt denna "
-"server."
+"bifoga|bifogar|bifogat|inkludera|inkluderar|inkluderat|bilaga|bilagor|skickar"
+" med|medföljande|attachment"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
-msgid "Geary will not add or update this email account."
-msgstr "Geary kommer inte att lägga till eller uppdatera detta e-postkonto"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Vill du förkasta detta meddelande?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-"this account."
-msgstr ""
-"Val av ”Lita inte på denna server” innebär att Geary kommer att sluta "
-"använda detta konto."
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Skicka meddelande med en tom ämnesrad och utan innehåll?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr "Geary kommer att avsluta om du inte har andra e-postkonton öppna."
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Skicka meddelande med en tom ämnesrad?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
-msgid ""
-"Contact your system administrator or email service provider if you have any "
-"question about these issues."
-msgstr ""
-"Kontakta din systemadministratör eller leverantören för e-posttjänsten om du "
-"har frågor kring dessa problem."
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Skicka meddelande utan innehåll?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
-msgstr "Serverns certifikat är inte signerat av en känd utfärdare"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Skicka meddelande utan att bifoga filer?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
-msgid "The server's identity does not match the identity in the certificate"
-msgstr "Serverns identitet överensstämmer inte med identiteten i certifikatet"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Kan inte bifoga din fil"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
-msgid "The server's certificate has expired"
-msgstr "Serverns certifikat har gått ut"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "\"%s\" kunde inte hittas."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
-msgid "The server's certificate has not been activated"
-msgstr "Serverns certifikat har inte aktiverats"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "”%s” är en mapp."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
-msgid "The server's certificate has been revoked and is now invalid"
-msgstr "Serverns certifikat har återkallats och är nu ogiltigt"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "”%s” är en tom fil."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
-msgid "The server's certificate is considered insecure"
-msgstr "Serverns certifikat är betraktat som osäkert"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "”%s” kunde inte öppnas."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
-msgid "An error has occurred processing the server's certificate"
-msgstr "Ett fel har uppstått när serverns certifikat hanterades"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "”%s” är redan bifogad och kommer att skickas."
 
-#. 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 "Geary requires your email password to continue"
-msgstr "Geary kräver ditt e-postlösenord för att fortsätta"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. 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 meddelande"
-msgstr[1] "%d meddelanden"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Till: "
 
-#. / 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 oläst"
-msgstr[1] "%d olästa"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Cc: "
 
-#. / 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/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Bcc: "
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Inkorgar"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "Svara-till: "
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d resultat"
-msgstr[1] "%d resultat"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Välj färg"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Nya meddelanden"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr "%1$s via %2$s"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d nytt meddelande"
-msgstr[1] "%d nya meddelanden"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_Från:"
 
-#: ../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 nytt meddelande totalt"
-msgstr[1] "%s, %d nya meddelanden totalt"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 annat nytt meddelande för %s)"
-msgstr[1] ""
-"%s\n"
-"(%d andra nya meddelanden för %s)"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Skickar…"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Öppna"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i träff"
+msgstr[1] "%i träffar"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i träff (från början)"
+msgstr[1] "%i träffar (från början)"
 
-#. / 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"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "ingen sökträff"
 
-#. / 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"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_OK"
 
-#. / 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 "%b %-e"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Avbryt"
 
-#. / 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"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Stäng"
 
-#. / 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 "%B %-e, %Y %-l:%M %P"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Förkasta"
 
-#. / 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"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Öppna"
 
-#. / 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 "%B %-e, %Y %-l:%M %P"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Skriv ut…"
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Nu"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Ta bort"
 
-#: ../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "%dm sedan"
-msgstr[1] "%dm sedan"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Behåll"
 
-#: ../src/client/util/util-date.vala:171
-#, c-format
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "%dh sedan"
-msgstr[1] "%dh sedan"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Sök i all e-post i alla konton efter nyckelord (Ctrl+S)"
 
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "Igår"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Indexerar %s konto"
 
-#. / 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"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(inget ämne)"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary Mail"
 
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "byte"
+#~ msgid "Send and receive email"
+#~ msgstr "Skicka och ta emot e-post"
 
-#: ../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Email;E-mail;Mail;Epost;E-Post;"
 
-#: ../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#~ msgid "Compose Message"
+#~ msgstr "Skriv meddelande"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#~ msgid "Send by email"
+#~ msgstr "Skicka som e-post"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#~ msgid "Send files using Geary"
+#~ msgstr "Skicka filer med Geary"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#~ msgid "_Donate"
+#~ msgstr "_Donera"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Kan inte avlägsna kontot</span> "
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Ett textinmatningsfönster som tillhör detta konto är redan öppet. Skicka "
+#~ "eller förkasta det meddelandet och försök igen."
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Annan"
+#~ msgid "Add account"
+#~ msgstr "Lägg till konto"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#~ msgid "Edit account"
+#~ msgstr "Redigera konto"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#~ msgid "Remove account"
+#~ msgstr "Ta bort konto"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Inkorg"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Vänta medan Geary bekräftar dina kontoinställningar."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Utkast"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Opålitlig anslutning"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Skickad e-post"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "Lita _alltid på denna server"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Viktig"
+#~ msgid "_Trust This Server"
+#~ msgstr "Li_ta på denna server"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Viktigt"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "Lita inte på _denna server"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Alla brev"
+#~ msgid "_Undo"
+#~ msgstr "_Ångra"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Skräppost"
+#~ msgid "_Redo"
+#~ msgstr "_Upprepa"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Papperskorg"
+#~ msgid "Cu_t"
+#~ msgstr "Klipp u_t"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Utkorg"
+#~ msgid "_Paste"
+#~ msgstr "_Klistra in"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Arkiv"
+#~ msgid "_Left"
+#~ msgstr "_Vänster"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-msgstr "Ingen"
+#~ msgid "_Right"
+#~ msgstr "_Höger"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-msgid "attachment"
-msgstr "bilaga"
+#~ msgid "_Center"
+#~ msgstr "_Centrerad"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
-msgstr "bcc"
+#~ msgid "_Justify"
+#~ msgstr "_Marginaljusterad"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
-msgstr "innehåll"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Länk (Ctrl+L)"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "cc"
-msgstr "cc"
+#~ msgid "C_olor"
+#~ msgstr "Fär_g"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
-msgstr "från"
+#~ msgid "More options"
+#~ msgstr "Fler inställningar"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-msgid "subject"
-msgstr "ämne"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Citera text (Ctrl+])"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
-msgstr "till"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Av-citera text (Ctrl+[)"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
-msgstr "mig"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Ta bort formatering (Ctrl+Space)"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-msgid "Drafts | Draft"
-msgstr "Utkast | Drafts | Draft"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Klistra in _med formatering"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "Skickat | Skickade brev | Sent | Sent Mail | Sent Email | Sent E-Mail"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Fet (Ctrl+B)"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
-msgstr ""
-"Skräppost | Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | "
-"Bulk Email | Bulk E-Mail"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Kursiv (Ctrl+I)"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Papperskorg | Papperskorgen | Trash | Rubbish | Rubbish Bin"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Understruken (Ctrl+U)"
 
-#. List of folder names to match for Archive, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
-msgid "Archive | Archives"
-msgstr "Arkiv | Archive | Archives"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Genomstruken (Ctrl+K)"
 
-#. / 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:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a %x klockan %H:%M %z"
+#~ msgid "_Rich Text"
+#~ msgstr "_Rich Text"
 
-#. / 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:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "%1$s skrev %2$s:"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Visa utökade fält"
 
-#. / 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:228
-#, c-format
-msgid "%s wrote:"
-msgstr "%s skrev:"
+#~ msgctxt "Label"
+#~ msgid "Close and Save"
+#~ msgstr "Stäng och spara"
 
-#. / 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:234
-#, c-format
-msgid "On %s:"
-msgstr "%s:"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "Stäng och spara"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Vidarebefordrat meddelande ----------"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "Stäng och spara"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "Från: %s\n"
+#~ msgctxt "Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Stäng och förkasta"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Ämne: %s\n"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "Stäng och förkasta"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "Datum: %s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "Stäng och förkasta"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "Till: %s\n"
+#~ msgid "Lar_ge"
+#~ msgstr "_Stor"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Cc: %s\n"
+#~ msgid "Large"
+#~ msgstr "Stor"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">Kan inte avlägsna kontot</span> "
+#~ msgid "_Medium"
+#~ msgstr "_Medel"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Ett textinmatningsfönster som tillhör detta konto är redan öppet. Skicka "
-"eller förkasta det meddelandet och försök igen."
+#~ msgid "Medium"
+#~ msgstr "Medel"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Lägg till konto"
+#~ msgid "_Small"
+#~ msgstr "_Liten"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Redigera konto"
+#~ msgid "Small"
+#~ msgstr "Liten"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Ta bort konto"
+#~ msgid "S_ans Serif"
+#~ msgstr "S_ans Serif"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Vänta medan Geary bekräftar dina kontoinställningar."
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Opålitlig anslutning"
+#~ msgid "S_erif"
+#~ msgstr "S_erif"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "Lita _alltid på denna server"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "Li_ta på denna server"
+#~ msgid "_Fixed Width"
+#~ msgstr "_Fast bredd"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "Lita inte på _denna server"
+#~ msgid "Fixed Width"
+#~ msgstr "Fast bredd"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Ångra"
-
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Upprepa"
-
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "Klipp u_t"
-
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "_Klistra in"
-
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Vänster"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Höger"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Centrerad"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Marginaljusterad"
-
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Länk (Ctrl+L)"
-
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "Fär_g"
-
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Fler inställningar"
-
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Citera text (Ctrl+])"
-
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Av-citera text (Ctrl+[)"
-
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Ta bort formatering (Ctrl+Space)"
-
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Klistra in _med formatering"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Fet (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Kursiv (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Understruken (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Genomstruken (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "_Rich Text"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Visa utökade fält"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "Stäng och spara"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "Stäng och spara"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "Stäng och spara"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "Stäng och förkasta"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "Stäng och förkasta"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "Stäng och förkasta"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "_Stor"
-
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "Stor"
-
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "_Medel"
-
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "Medel"
-
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "_Liten"
-
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "Liten"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
-
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "S_erif"
-
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "Serif"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "_Fast bredd"
-
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "Fast bredd"
-
-#: ../ui/composer.glade.h:42
-msgid "Detach"
-msgstr "Frikoppla"
-
-#: ../ui/composer.glade.h:43
-msgid "Detach (Ctrl+D)"
-msgstr "Frikoppla (Ctrl+D)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_Skicka"
-
-#: ../ui/composer.glade.h:45
-msgid "Send"
-msgstr "Skicka"
-
-#: ../ui/composer.glade.h:46
-msgid "Send (Ctrl+Enter)"
-msgstr "Skicka (Ctrl+Enter)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "_Bifoga fil"
-
-#: ../ui/composer.glade.h:48
-msgid "Attach File"
-msgstr "Bifoga fil"
-
-#: ../ui/composer.glade.h:49
-msgid "_Include Original Attachments"
-msgstr "_Inkludera bifogade filer från original"
-
-#: ../ui/composer.glade.h:50
-msgid "Include Original Attachments"
-msgstr "Inkludera bifogade filer från original"
-
-#: ../ui/composer.glade.h:51
-msgid "Application Menu"
-msgstr "Programmeny"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:53
-msgid "_To"
-msgstr "_Till"
+#~ msgid "Detach"
+#~ msgstr "Frikoppla"
 
-#: ../ui/composer.glade.h:54
-msgid "_Cc"
-msgstr "_Cc"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Frikoppla (Ctrl+D)"
 
-#: ../ui/composer.glade.h:55
-msgid "_Subject"
-msgstr "_Ämne"
+#~ msgid "_Send"
+#~ msgstr "_Skicka"
 
-#: ../ui/composer.glade.h:56
-msgid "_Bcc"
-msgstr "_Bcc"
+#~ msgid "Send"
+#~ msgstr "Skicka"
 
-#: ../ui/composer.glade.h:57
-msgid "_Reply-To"
-msgstr "Sva_ra-till"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Skicka (Ctrl+Enter)"
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:59
-msgid "From"
-msgstr "Från"
+#~ msgid "_Attach File"
+#~ msgstr "_Bifoga fil"
 
-#: ../ui/composer.glade.h:60
-msgid "Drop files here"
-msgstr "Släpp filer här"
+#~ msgid "Attach File"
+#~ msgstr "Bifoga fil"
 
-#: ../ui/composer.glade.h:61
-msgid "To add them as attachments"
-msgstr "För att bifoga dem"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Inkludera bifogade filer från original"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-msgid "Remove email address"
-msgstr "Ta bort e-postadress"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Inkludera bifogade filer från original"
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"Vissa e-posttjänster kräver att ytterligare adresser har konfigurerats på "
-"servern. Kontakta din e-postleverantör för vidare information."
+#~ msgid "Application Menu"
+#~ msgstr "Programmeny"
 
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "_Uppdatera"
+#~ msgid "_To"
+#~ msgstr "_Till"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Sök:"
+#~ msgid "_Cc"
+#~ msgstr "_Cc"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Föregående"
+#~ msgid "_Subject"
+#~ msgstr "_Ämne"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Nästa"
+#~ msgid "_Bcc"
+#~ msgstr "_Bcc"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Gör skillnad på gemener/VERSALER"
+#~ msgid "_Reply-To"
+#~ msgstr "Sva_ra-till"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "etikett"
+#~ msgid "From"
+#~ msgstr "Från"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Lösenord"
+#~ msgid "Drop files here"
+#~ msgstr "Släpp filer här"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "_E-postadress"
+#~ msgid "To add them as attachments"
+#~ msgstr "För att bifoga dem"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Lösenord"
+#~ msgid "Remove email address"
+#~ msgstr "Ta bort e-postadress"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "_Tjänst"
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "Vissa e-posttjänster kräver att ytterligare adresser har konfigurerats på "
+#~ "servern. Kontakta din e-postleverantör för vidare information."
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "N_amn"
+#~ msgid "_Update"
+#~ msgstr "_Uppdatera"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "Al_ias"
+#~ msgid "Find:"
+#~ msgstr "Sök:"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Arbete, Hemma, osv."
+#~ msgid "_Previous"
+#~ msgstr "_Föregående"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_Spara skickad e-post"
+#~ msgid "_Next"
+#~ msgstr "_Nästa"
 
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
-msgstr "Y_tterligare e-postadresser…"
+#~ msgid "_Case sensitive"
+#~ msgstr "_Gör skillnad på gemener/VERSALER"
 
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "IMAP-inställningar"
+#~ msgid "label"
+#~ msgstr "etikett"
 
-#: ../ui/login.glade.h:12
-msgid "Se_rver"
-msgstr "Se_rver"
+#~ msgid "Password"
+#~ msgstr "Lösenord"
 
-#: ../ui/login.glade.h:13
-msgid "P_ort"
-msgstr "P_ort"
+#~ msgid "E_mail address"
+#~ msgstr "_E-postadress"
 
-#: ../ui/login.glade.h:14
-msgid "Ser_ver"
-msgstr "Ser_ver"
+#~ msgid "_Password"
+#~ msgstr "_Lösenord"
 
-#: ../ui/login.glade.h:15
-msgid "Por_t"
-msgstr "Por_t"
+#~ msgid "S_ervice"
+#~ msgstr "_Tjänst"
 
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "SMTP-inställningar"
+#~ msgid "N_ame"
+#~ msgstr "N_amn"
 
-#: ../ui/login.glade.h:17
-msgid "User_name"
-msgstr "Användar_namn"
+#~ msgid "N_ickname"
+#~ msgstr "Al_ias"
 
-#: ../ui/login.glade.h:18
-msgid "Pass_word"
-msgstr "Lösen_ord"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Arbete, Hemma, osv."
 
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr "SMTP-användarnamn"
+#~ msgid "_Save sent mail"
+#~ msgstr "_Spara skickad e-post"
 
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr "SMTP-lösenord"
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "Y_tterligare e-postadresser…"
 
-#: ../ui/login.glade.h:21
-msgid "_Username"
-msgstr "An_vändarnamn"
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP-inställningar"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr "IMAP-användarnamn"
+#~ msgid "Se_rver"
+#~ msgstr "Se_rver"
 
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr "IMAP-lösenord"
+#~ msgid "P_ort"
+#~ msgstr "P_ort"
 
-#: ../ui/login.glade.h:24
-msgid "Encr_yption"
-msgstr "Kr_yptering"
+#~ msgid "Ser_ver"
+#~ msgstr "Ser_ver"
 
-#: ../ui/login.glade.h:25
-msgid "Encrypt_ion"
-msgstr "Krypter_ing"
+#~ msgid "Por_t"
+#~ msgstr "Por_t"
 
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP-inställningar"
 
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "User_name"
+#~ msgstr "Användar_namn"
 
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "Ingen autentisering _krävs"
+#~ msgid "Pass_word"
+#~ msgstr "Lösen_ord"
 
-#: ../ui/login.glade.h:30
-msgid "Use IMAP cre_dentials"
-msgstr "Använ_d autentiseringsuppgifter för IMAP"
+#~ msgid "SMTP username"
+#~ msgstr "SMTP-användarnamn"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Textinmatningsfönster"
+#~ msgid "SMTP password"
+#~ msgstr "SMTP-lösenord"
 
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr "Spara _utkast på servern"
+#~ msgid "_Username"
+#~ msgstr "An_vändarnamn"
 
-#: ../ui/login.glade.h:33
-msgid "Si_gn emails (HTML allowed):"
-msgstr "Si_gnera e-postmeddelanden (HTML tillåtet):"
+#~ msgid "IMAP username"
+#~ msgstr "IMAP-användarnamn"
 
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "Lagring"
+#~ msgid "IMAP password"
+#~ msgstr "IMAP-lösenord"
 
-#: ../ui/login.glade.h:35
-msgid "_Download mail"
-msgstr "_Hämta e-post"
+#~ msgid "Encr_yption"
+#~ msgstr "Kr_yptering"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "SMTP-certifikation"
+#~ msgid "Encrypt_ion"
+#~ msgstr "Krypter_ing"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "Användarnamn"
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Kom ihåg lösenord"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Autentisera"
+#~ msgid "No authentication re_quired"
+#~ msgstr "Ingen autentisering _krävs"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Läser"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Använ_d autentiseringsuppgifter för IMAP"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "Välj nästa meddelande _automatiskt"
+#~ msgid "Composer"
+#~ msgstr "Textinmatningsfönster"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "_Visa förhandsvisning av konversation"
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Spara _utkast på servern"
 
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr "Använd tredelad vy"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "Si_gnera e-postmeddelanden (HTML tillåtet):"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "Aktivera _stavningskontroll"
+#~ msgid "Storage"
+#~ msgstr "Lagring"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "Aviseringar"
+#~ msgid "_Download mail"
+#~ msgstr "_Hämta e-post"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "S_pela notifieringsljud"
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP-certifikation"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "Visa _aviseringar för ny e-post"
+#~ msgid "Username"
+#~ msgstr "Användarnamn"
 
-#: ../ui/preferences.glade.h:10
-msgid "Always _watch for new mail"
-msgstr "_Kontrollera alltid om det finns ny e-post"
+#~ msgid "_Remember password"
+#~ msgstr "_Kom ihåg lösenord"
 
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr "Geary kommer att köra i bakgrunden och avisera om ny e-post"
+#~ msgid "_Authenticate"
+#~ msgstr "_Autentisera"
 
-#: ../ui/preferences.glade.h:12
-msgid "Preferences"
-msgstr "Inställningar"
+#~ msgid "Reading"
+#~ msgstr "Läser"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Är du säker på att du vill ta bort "
-"detta konto?</span>"
+#~ msgid "_Automatically select next message"
+#~ msgstr "Välj nästa meddelande _automatiskt"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"All e-post som tillhör detta konto kommer att tas bort från din dator. Detta "
-"påverkar inte e-posten på servern."
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Visa förhandsvisning av konversation"
+
+#~ msgid "Use _three pane view"
+#~ msgstr "Använd tredelad vy"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Aktivera _stavningskontroll"
+
+#~ msgid "Notifications"
+#~ msgstr "Aviseringar"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "S_pela notifieringsljud"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Visa _aviseringar för ny e-post"
+
+#~ msgid "Always _watch for new mail"
+#~ msgstr "_Kontrollera alltid om det finns ny e-post"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr "Geary kommer att köra i bakgrunden och avisera om ny e-post"
+
+#~ msgid "Preferences"
+#~ msgstr "Inställningar"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Är du säker på att du vill ta bort "
+#~ "detta konto?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "All e-post som tillhör detta konto kommer att tas bort från din dator. Detta "
+#~ "påverkar inte e-posten på servern."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Alias:"
+#~ msgid "Nickname:"
+#~ msgstr "Alias:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "E-postadress:"
+#~ msgid "Email address:"
+#~ msgstr "E-postadress:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Geary-uppgradering pågår…"
+#~ msgid "Geary update in progress…"
+#~ msgstr "Geary-uppgradering pågår…"
diff --git a/po/te.po b/po/te.po
index 16ac5f4..98e1494 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,1495 +9,1401 @@ 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-20 19:28+0000\n"
-"Last-Translator: yorbajim <jim yorba org>\n"
-"Language-Team: Telugu (http://www.transifex.com/projects/p/geary/language/";
-"te/)\n"
-"Language: te\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:12+0000\n"
+"Last-Translator: Jim Nelson <jim yorba org>\n"
+"Language-Team: Telugu "
+"(http://www.transifex.com/projects/p/geary/language/te/)\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"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:56+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: te\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:641
-msgid "        &#8226; Connection error.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:624
-msgid "        &#8226; Email address already added to Geary.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:628
-msgid "        &#8226; IMAP connection error.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:631
-msgid "        &#8226; IMAP username or password incorrect.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:621
-msgid "        &#8226; Invalid account nickname.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:634
-msgid "        &#8226; SMTP connection error.\n"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "వేగుపెట్టె"
 
-#: ../../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "చిత్తులు"
 
-#: ../../src/client/accounts/add-edit-page.vala:645
-msgid "        &#8226; Username or password incorrect.\n"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1203
-msgid " (Invalid?)"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:972
-#, c-format
-msgid "\"%s\" already attached for delivery."
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:937
-#, c-format
-msgid "\"%s\" could not be found."
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:965
-#, c-format
-msgid "\"%s\" could not be opened for reading."
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:944
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "చెత్త"
 
-#: ../../src/client/composer/composer-window.vala:951
-#, c-format
-msgid "\"%s\" is an empty file."
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
 msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
 msgstr ""
 
-#. / 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"
-
-#. / 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 "%B %-e, %Y %-l:%M %P"
-
-#. / 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 "%B %-e, %Y %-l:%M %P"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr ""
 
-#. / 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, %b %-e, %Y at %-l:%M %p"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr ""
 
-#. / 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 "%b %-e"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr ""
 
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] ""
-msgstr[1] ""
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "జీమెయిల్"
 
-#: ../../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] ""
-msgstr[1] ""
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "యాహూ! మెయిల్"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:43
-#, c-format
-msgid "%d results"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
 msgstr ""
 
-#. / 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] ""
-msgstr[1] ""
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "ఇతరాలు"
 
-#: ../../src/client/util/util-date.vala:170
-#, c-format
-msgid "%dh ago"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
 msgstr ""
 
-#: ../../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
 msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:222
-#, c-format
-msgid "%i matches"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
 msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:224
-#, c-format
-msgid "%i matches (wrapped)"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
 msgstr ""
 
-#. / 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"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr ""
 
-#. / 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"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:107
-#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
-msgstr[1] ""
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr ""
 
-#. / 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)"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
 msgstr ""
 
-#: ../../src/client/views/conversation-web-view.vala:289
-#, c-format
-msgid "%s - Conversation Inspector"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
 msgstr ""
 
-#: ../../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %b %-e, %Y at %-l:%M %p"
+
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
 msgstr ""
 
 #. / 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
+#: ../src/engine/rfc822/rfc822-utils.vala:228
 msgid "%s wrote:"
 msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] ""
-msgstr[1] ""
-
-#. / 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"
+#. / 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:234
+msgid "On %s:"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:246
-#, c-format
-msgid "%u conversations selected."
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:743
-#, c-format
-msgid "%u read messages"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "పంపినవారు: %s\n"
+
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
 msgstr ""
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "తేదీ: %s\n"
 
-#: ../../src/client/util/util-email.vala:30
-msgid "(no subject)"
-msgstr ""
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "వీరికి: %s\n"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:211
-msgid "1 month back"
-msgstr ""
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "ఏదీకాదు"
 
-#: ../../src/client/accounts/add-edit-page.vala:214
-msgid "1 year back"
-msgstr ""
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "వేగు కక్షిదారు"
 
-#: ../../src/client/accounts/add-edit-page.vala:210
-msgid "2 weeks back"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:212
-msgid "3 months back"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "యోర్బ జాల స్థలిని సందర్శించండి"
+
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:213
-msgid "6 months back"
+#: ../src/client/application/geary-controller.vala:62
+msgid "Delete conversation (Shift+Delete)"
 msgstr ""
 
-#: ../../ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
+#: ../src/client/application/geary-controller.vala:63
+msgid "Delete conversations (Shift+Delete)"
 msgstr ""
 
-#: ../../ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr ""
 
-#: ../../ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1491
-#, c-format
-msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+#: ../src/client/application/geary-controller.vala:72
+msgid "_Archive"
+msgstr "కవిలె (_A)"
+
+#: ../src/client/application/geary-controller.vala:73
+msgid "Archive conversation (A)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:245
-msgid "A_ccounts"
+#: ../src/client/application/geary-controller.vala:74
+msgid "Archive conversations (A)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1227
-#, c-format
-msgid "About %s"
-msgstr "%s గురించి"
+#: ../src/client/application/geary-controller.vala:77
+msgid "Mark as S_pam"
+msgstr ""
 
-#: ../../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
+#: ../src/client/application/geary-controller.vala:78
+msgid "Mark as not S_pam"
 msgstr ""
 
-#: ../../ui/account_list.glade:71
-msgid "Add account"
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
+msgid "Mark conversation"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:304
-msgid "Add label"
+#: ../src/client/application/geary-controller.vala:81
+msgid "Mark conversations"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
+msgid "Move conversation"
 msgstr ""
 
-#: ../../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."
+#: ../src/client/application/geary-controller.vala:85
+msgid "Move conversations"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:24
-msgid "Allow inspection of WebView"
+#: ../src/client/application/geary-controller.vala:372
+msgid "A_ccounts"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:509
-msgid "Always Show From Sender"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:377
+#: ../src/client/components/stock.vala:27
+msgid "_Preferences"
+msgstr "ప్రాధాన్యతలు (_P)"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/components/stock.vala:25
+msgid "_Help"
+msgstr "సహాయం (_H)"
 
-#: ../../src/client/geary-controller.vala:48
-msgid "Archive conversation (Delete, Backspace, A)"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:385
+#: ../src/client/components/stock.vala:21
+msgid "_About"
+msgstr "గురించి (_A)"
 
-#: ../../src/client/geary-controller.vala:49
-msgid "Archive conversations (Delete, Backspace, A)"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:389
+#: ../src/client/components/stock.vala:29
+msgid "_Quit"
+msgstr "నిష్క్రమించు (_Q)"
 
-#: ../../src/client/geary-controller.vala:1477
-#, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:394
+msgid "_Mark as..."
+msgstr "ఇలా గుర్తుపెట్టు...(_M)"
 
-#: ../../src/client/geary-controller.vala:1478
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
+#: ../src/client/application/geary-controller.vala:400
+msgid "Mark as _Read"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:614
-msgid "Bcc:"
-msgstr "బిసిసి:"
-
-#: ../../ui/composer.glade:113
-msgid "Bold (Ctrl+B)"
+#: ../src/client/application/geary-controller.vala:406
+msgid "Mark as _Unread"
 msgstr ""
 
-#: ../../ui/composer.glade:69
-msgid "C_olor"
-msgstr "రంగు (_o)"
+#: ../src/client/application/geary-controller.vala:412
+msgid "_Star"
+msgstr "నక్షత్రించు (_S)"
 
-#: ../../src/client/composer/composer-window.vala:926
-msgid "Cannot add attachment"
+#: ../src/client/application/geary-controller.vala:417
+msgid "U_nstar"
+msgstr "అనక్షత్రించు"
+
+#: ../src/client/application/geary-controller.vala:427
+msgid "Add label"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:611
-msgid "Cc:"
-msgstr "సిసి:"
+#: ../src/client/application/geary-controller.vala:428
+msgid "_Label"
+msgstr "నామాంకం (_L)"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
+#: ../src/client/application/geary-controller.vala:432
+msgid "_Move"
 msgstr ""
 
-#: ../../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "దస్త్రాన్ని ఎంచుకోండి"
-
-#: ../../src/client/geary-controller.vala:553
-msgid "Co_ntinue"
-msgstr "కొనసాగండి (_u)"
+#: ../src/client/application/geary-controller.vala:436
+msgid "Compose new message (Ctrl+N, N)"
+msgstr ""
 
-#: ../../src/client/geary-application.vala:29
-msgid "Compose Message"
-msgstr "సందేశాన్ని సృష్టించండి"
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
+msgid "_Reply"
+msgstr "ప్రతిస్పందించు (_R)"
 
-#: ../../src/client/geary-controller.vala:313
-msgid "Compose new message (Ctrl+N, N)"
+#: ../src/client/application/geary-controller.vala:441
+msgid "Reply (Ctrl+R, R)"
 msgstr ""
 
-#: ../../ui/preferences.glade:117
-msgid "Composer"
+#: ../src/client/application/geary-controller.vala:445
+msgid "R_eply All"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:897
-msgid "Copy _Email Address"
+#: ../src/client/application/geary-controller.vala:446
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:902
-msgid "Copy _Link"
-msgstr "లంకెను నకలించు (_L)"
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
+msgid "_Forward"
+msgstr "మునుముందుకు (_F)"
 
-#: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
+#: ../src/client/application/geary-controller.vala:452
+msgid "Forward (Ctrl+L, F)"
 msgstr ""
 
-#: ../../ui/composer.glade:21
-msgid "Cu_t"
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:620
-msgid "Date:"
-msgstr "తేదీ:"
-
-#: ../../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "తేదీ: %s\n"
-
-#: ../../src/client/geary-controller.vala:43
-msgid "Delete conversation (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:44
-msgid "Delete conversations (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:25
-msgid "Display program version"
-msgstr "కార్యక్రమం రూపాంతరాన్ని ప్రదర్శించు"
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:663
-msgid "Do you want to discard the unsaved message?"
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:666
-msgid "Do you want to discard this message?"
+#: ../src/client/application/geary-controller.vala:746
+msgid "Unable to store server trust exception"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1479
-msgid "Don't _ask me again"
-msgstr "నన్ను మరలా అడగవద్దు (_a)"
+#: ../src/client/application/geary-controller.vala:983
+msgid "Your settings are insecure"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "చిత్తులు"
+#: ../src/client/application/geary-controller.vala:984
+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 ""
 
-#: ../../ui/composer.glade:419
-msgid "Drop files here"
-msgstr "దస్త్రాలను ఇక్కడ పడవేయండి"
+#: ../src/client/application/geary-controller.vala:985
+msgid "Co_ntinue"
+msgstr "కొనసాగండి (_u)"
 
-#: ../../ui/login.glade:115
-msgid "E_mail address:"
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/components/status-bar.vala:29
+msgid "Error sending email"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:704
-msgid "E_xit"
+#: ../src/client/application/geary-controller.vala:1064
+msgid ""
+"Geary encountered an error sending an email.  If the problem persists, "
+"please manually delete the email from your Outbox folder."
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:533
-msgid "Edit Draft"
+#: ../src/client/application/geary-controller.vala:1068
+#: ../src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
 msgstr ""
 
-#: ../../ui/account_list.glade:84
-msgid "Edit account"
+#: ../src/client/application/geary-controller.vala:1069
+msgid ""
+"Geary encountered an error saving a sent message to Sent Mail.  The message "
+"will stay in your Outbox folder until you delete it."
 msgstr ""
 
-#: ../../ui/remove_confirm.glade:94
-msgid "Email address:"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:1138
+msgid "Labels"
+msgstr "నామాంకాలు"
 
-#: ../../src/client/geary-application.vala:28
-msgid "Email;E-mail;Mail;"
+#: ../src/client/application/geary-controller.vala:1150
+msgid "Unable to open the database for %s"
 msgstr ""
 
-#: ../../ui/preferences.glade:131
-msgid "Enable _spell checking"
+#: ../src/client/application/geary-controller.vala:1151
+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 ""
 
-#: ../../ui/login.glade:588
-msgid "Encr_yption:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "_Rebuild"
 msgstr ""
 
-#: ../../ui/login.glade:607
-msgid "Encrypt_ion:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "E_xit"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-msgid "Enter your account information to get started."
+#: ../src/client/application/geary-controller.vala:1162
+msgid "Unable to rebuild database for \"%s\""
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:714
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:43
-msgid "Error saving"
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
+msgid "Unable to open local mailbox for %s"
 msgstr ""
 
-#. / 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"
+#: ../src/client/application/geary-controller.vala:1186
+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 ""
 
-#: ../../src/client/accounts/add-edit-page.vala:216
-msgid "Everything"
+#: ../src/client/application/geary-controller.vala:1196
+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 ""
 
-#: ../../src/client/views/conversation-viewer.vala:1897
-msgid "Failed to open default text editor."
+#: ../src/client/application/geary-controller.vala:1207
+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 ""
 
-#: ../../src/client/geary-args.vala:54
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:1715
+msgid "About %s"
+msgstr "%s గురించి"
 
-#. / 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"
+#. / 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-controller.vala:1718
+msgid "translator-credits"
 msgstr ""
+"Praveen Illa <mail2ipn gmail com>, 2012.\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Jim Nelson https://launchpad.net/~yorba-jim";
 
-#: ../../ui/composer.glade:182
-msgid "Fixed Width"
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:329
-msgid "Forward (Ctrl+L, F)"
+#: ../src/client/application/geary-controller.vala:1986
+msgid "Are you sure you want to open \"%s\"?"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:605
-msgid "From:"
-msgstr "పంపినవారు:"
-
-#: ../../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "పంపినవారు: %s\n"
+#: ../src/client/application/geary-controller.vala:1987
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
 
-#: ../../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "గిబై"
+#: ../src/client/application/geary-controller.vala:1988
+msgid "Don't _ask me again"
+msgstr "నన్ను మరలా అడగవద్దు (_a)"
 
-#: ../../src/client/geary-application.vala:25
-msgid "Geary Mail"
-msgstr "గేరీ వేగు"
+#: ../src/client/application/geary-controller.vala:2006
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:626
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 
-#: ../../ui/password-dialog.glade:315
-msgid "General"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:2011
+msgid "_Replace"
+msgstr "ప్రతిస్థాపించు (_R)"
 
-#: ../../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "జీమెయిల్"
+#: ../src/client/application/geary-controller.vala:2309
+msgid "Close open draft messages?"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:133
-msgid "IMAP Credentials"
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
 msgstr ""
 
-#: ../../ui/login.glade:572
-msgid "IMAP password"
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
 msgstr ""
 
-#: ../../ui/login.glade:286 ../../ui/password-dialog.glade:334
-msgid "IMAP settings"
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
 msgstr ""
 
-#: ../../ui/login.glade:556
-msgid "IMAP username"
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "వేగుపెట్టె"
+#: ../src/client/application/geary-controller.vala:2489
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
+#: ../src/client/application/geary-controller.vala:2491
+msgid "Delete"
 msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:163
-#, c-format
-msgid "Indexing %s account"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
 msgstr ""
 
-#: ../../ui/composer.glade:120
-msgid "Italic (Ctrl+I)"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
 msgstr ""
 
-#: ../../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "కిబై"
-
-#: ../../src/client/geary-controller.vala:689
-msgid "Labels"
-msgstr "నామాంకాలు"
-
-#: ../../ui/composer.glade:151
-msgid "Lar_ge"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
 msgstr ""
 
-#: ../../ui/composer.glade:152
-msgid "Large"
-msgstr "అతిపెద్ద"
-
-#: ../../ui/composer.glade:62
-msgid "Link (Ctrl+L)"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
 msgstr ""
 
-#. / 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"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:11
+#: ../src/client/application/geary-args.vala:12
 msgid "Log conversation monitoring"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:21
-msgid "Log database queries (generates lots of messages)"
-msgstr ""
-
-#. / "Normalization" can also be called "synchronization"
-#: ../../src/client/geary-args.vala:23
-msgid "Log folder normalization"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:13
+#: ../src/client/application/geary-args.vala:14
 msgid "Log network activity"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:12
-msgid "Log network deserialization"
+#. / 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 ""
 
 #. / Serialization is how commands and responses are converted into a stream of bytes for
 #. / network transmission
-#: ../../src/client/geary-args.vala:19
+#: ../src/client/application/geary-args.vala:20
 msgid "Log network serialization"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:20
+#: ../src/client/application/geary-args.vala:21
 msgid "Log periodic activity"
 msgstr ""
 
-#: ../../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "మెబై"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr ""
 
-#: ../../src/client/geary-application.vala:26
-msgid "Mail Client"
-msgstr "వేగు కక్షిదారు"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1479
-msgid "Mark Unread From _Here"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:52
-msgid "Mark as S_pam"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:277
-msgid "Mark as _Read"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "కార్యక్రమం రూపాంతరాన్ని ప్రదర్శించు"
+
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:283
-msgid "Mark as _Unread"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:53
-msgid "Mark as not S_pam"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:55
-#: ../../src/client/geary-controller.vala:269
-msgid "Mark conversation"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:56
-msgid "Mark conversations"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
 msgstr ""
 
-#: ../../src/client/views/formatted-conversation-data.vala:11
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "తెరువు"
+
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "నన్ను"
 
-#: ../../ui/composer.glade:158
-msgid "Medium"
-msgstr "మాధ్యమం"
-
-#: ../../ui/composer.glade:75
-msgid "More options"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:59
-#: ../../src/client/geary-controller.vala:308
-msgid "Move conversation"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:60
-msgid "Move conversations"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
 
-#: ../../ui/login.glade:176
-msgid "N_ame:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
 msgstr ""
 
-#: ../../ui/login.glade:230
-msgid "N_ickname:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "కొత్త సందేశం"
-
-#: ../../ui/remove_confirm.glade:80
-msgid "Nickname:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
 msgstr ""
 
-#: ../../ui/login.glade:661
-msgid "No authentication re_quired"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:275
-msgid "No conversations in folder."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:244
-msgid "No conversations selected."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:273
-msgid "No search results found."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:128
-#: ../../src/engine/api/geary-special-folder-type.vala:58
-msgid "None"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
 msgstr ""
 
-#: ../../ui/preferences.glade:158
-msgid "Notifications"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
 msgstr ""
 
-#: ../../src/client/util/util-date.vala:164
-msgid "Now"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
 msgstr ""
 
-#. / 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:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
 msgstr ""
 
-#. / 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:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
 msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "తెరువు"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "ఇతరాలు"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "దస్త్రాన్ని ఎంచుకోండి"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr ""
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "జోడించు (_A)"
 
-#: ../../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:10
-msgid "Output debugging information"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
 msgstr ""
 
-#: ../../ui/login.glade:337
-msgid "P_ort:"
+#. / 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 ""
 
-#: ../../ui/login.glade:474
-msgid "Pass_word:"
-msgstr ""
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "గేరీకి స్వాగతం."
 
-#: ../../ui/login.glade:101
-msgid "Password"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
 msgstr ""
 
-#: ../../ui/password-dialog.glade:196
-msgid "Password:"
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
 msgstr ""
 
-#: ../../ui/composer.glade:102
-msgid "Paste _With Formatting"
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your email password"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:47
-msgid "Please report comments, suggestions and bugs to:"
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
 msgstr ""
 
-#: ../../ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
 msgstr ""
 
-#: ../../ui/login.glade:421
-msgid "Por_t:"
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:367 ../../ui/password-dialog.glade:470
-msgid "Port:"
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
 msgstr ""
 
-#: ../../ui/composer.glade:81
-msgid "Quote text  (Ctrl+])"
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:322
-msgid "R_eply All"
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
 msgstr ""
 
-#: ../../ui/preferences.glade:55
-msgid "Reading"
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:274
-msgid "Real name:"
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:590
+#: ../src/client/accounts/add-edit-page.vala:730
 msgid "Remem_ber password"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:583
-msgid "Remem_ber passwords"
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
 msgstr ""
 
-#: ../../ui/account_list.glade:97
-msgid "Remove account"
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
 msgstr ""
 
-#: ../../ui/composer.glade:95
-msgid "Remove formatting (Ctrl+Space)"
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:318
-msgid "Reply (Ctrl+R, R)"
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:323
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1452
-msgid "Reply to _All"
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:163
-msgid "SMTP Credentials"
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
 msgstr ""
 
-#: ../../ui/login.glade:507
-msgid "SMTP password"
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
 msgstr ""
 
-#: ../../ui/login.glade:439 ../../ui/password-dialog.glade:437
-msgid "SMTP settings"
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
 msgstr ""
 
-#: ../../ui/login.glade:491
-msgid "SMTP username"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:124
-msgid "SSL"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:382 ../../ui/password-dialog.glade:485
-msgid "SSL/TLS encryption:"
-msgstr ""
+#. / 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"
 
-#: ../../src/client/dialogs/password-dialog.vala:126
-msgid "STARTTLS"
-msgstr ""
+#. / 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"
 
-#: ../../ui/composer.glade:169
-msgid "S_ans Serif"
-msgstr ""
+#. / 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"
 
-#: ../../ui/composer.glade:175
-msgid "S_erif"
-msgstr ""
+#. / 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 "%b %-e"
 
-#: ../../ui/login.glade:160
-msgid "S_ervice:"
-msgstr ""
+#. / 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"
 
-#: ../../ui/composer.glade:170
-msgid "Sans Serif"
-msgstr ""
+#. / 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 "%B %-e, %Y %-l:%M %P"
 
-#: ../../src/client/views/conversation-viewer.vala:1437
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] ""
-msgstr[1] ""
+#. / 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"
 
-#: ../../src/client/views/conversation-viewer.vala:1400
-msgid "Save All A_ttachments..."
-msgstr ""
+#. / 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 "%B %-e, %Y %-l:%M %P"
 
-#: ../../src/client/composer/composer-window.vala:41
-msgid "Saved"
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:42
-msgid "Saving"
-msgstr ""
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:304
-msgid "Se_rver:"
-msgstr ""
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../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"
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
 msgstr ""
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:39
-#: ../../src/client/ui/main-toolbar.vala:170
-#, c-format
-msgid "Search %s account"
+#. / 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
+msgid "%A"
 msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:76
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr ""
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "బైట్లు"
 
-#: ../../src/client/composer/composer-window.vala:1243
-msgid "Select Color"
-msgstr ""
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "టెబై"
 
-#: ../../src/client/ui/stock.vala:32
-#: ../../src/client/views/conversation-viewer.vala:916
-msgid "Select _All"
-msgstr ""
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "గిబై"
 
-#: ../../src/client/views/conversation-viewer.vala:910
-msgid "Select _Message"
-msgstr ""
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "మెబై"
 
-#: ../../src/client/geary-application.vala:27
-msgid "Send and receive email"
-msgstr ""
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "కిబై"
 
-#: ../../src/client/composer/composer-window.vala:747
-msgid "Send message with an empty body?"
-msgstr ""
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/composer/composer-window.vala:743
-msgid "Send message with an empty subject and body?"
-msgstr ""
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/composer/composer-window.vala:745
-msgid "Send message with an empty subject?"
+#. / 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
+msgid "%s, %s"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:749
-msgid "Send message without an attachment?"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
 msgstr ""
 
-#. / 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..."
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr ""
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:404
-msgid "Ser_ver:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
 msgstr ""
 
-#: ../../ui/composer.glade:176
-msgid "Serif"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
 msgstr ""
 
-#: ../../ui/password-dialog.glade:352 ../../ui/password-dialog.glade:455
-msgid "Server:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
 msgstr ""
 
-#: ../../ui/password-dialog.glade:259
-msgid "Service:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:508
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
 msgid "Show Images"
 msgstr ""
 
-#: ../../ui/preferences.glade:193
-msgid "Show _notifications for new mail"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
 msgstr ""
 
-#: ../../ui/composer.glade:164
-msgid "Small"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "పంపినవారు:"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "వీరికి:"
 
-#: ../../ui/login.glade:761
-msgid "Storage"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "సిసి:"
 
-#: ../../ui/composer.glade:134
-msgid "Strikethrough (Ctrl+K)"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "బిసిసి:"
 
-#: ../../src/client/views/conversation-viewer.vala:617
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
 msgid "Subject:"
 msgstr "విషయం:"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr ""
-
-#: ../../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "టెబై"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "తేదీ:"
 
-#: ../../src/client/geary-controller.vala:1493
-#, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/geary-controller.vala:747
-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."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
 msgstr ""
 
-#: ../../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 ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "నకలుచేయి (_C)"
 
-#: ../../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"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
 msgstr ""
 
-#: ../../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 ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "లంకెను నకలించు (_L)"
 
-#: ../../src/client/views/conversation-viewer.vala:1147
-msgid "This link appears to go to"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "This message contains remote images."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
 msgstr ""
 
-#: ../../ui/composer.glade:435
-msgid "To add them as attachments"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:608
-msgid "To:"
-msgstr "వీరికి:"
-
-#: ../../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "వీరికి: %s\n"
-
-#: ../../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "చెత్త"
-
-#: ../../src/client/geary-controller.vala:294
-msgid "U_nstar"
-msgstr "అనక్షత్రించు"
-
-#: ../../src/client/dialogs/password-dialog.vala:17
-msgid "Unable to login to email server"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
 msgstr ""
 
-#: ../../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"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:701
-#, c-format
-msgid "Unable to open the database for %s"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:713
-#, c-format
-msgid "Unable to rebuild database for \"%s\""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:619
-msgid "Unable to validate:\n"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "ఇలా భద్రపరుచు...(_S)"
 
-#: ../../ui/composer.glade:127
-msgid "Underline (Ctrl+U)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
 msgstr ""
 
-#: ../../ui/composer.glade:88
-msgid "Unquote text (Ctrl+[)"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/geary-args.vala:65
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
 msgstr ""
 
-#: ../../ui/login.glade:457
-msgid "User_name:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:70 ../../ui/password-dialog.glade:181
-msgid "Username:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:19
-msgid "Visit the Yorba web site"
-msgstr "యోర్బ జాల స్థలిని సందర్శించండి"
-
-#: ../../src/client/accounts/add-edit-page.vala:190
-#, c-format
-msgid "Welcome to Geary."
-msgstr "గేరీకి స్వాగతం."
-
-#: ../../ui/login.glade:252
-msgid "Work, Home, etc."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
 msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "యాహూ! మెయిల్"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "మూలాన్ని చూడండి (_V)"
 
-#: ../../src/client/util/util-date.vala:177
-msgid "Yesterday"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
 msgstr ""
 
-#: ../../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?"
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:551
-msgid "Your settings are insecure"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:258
-#: ../../src/client/ui/stock.vala:21
-msgid "_About"
-msgstr "గురించి (_A)"
-
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:22
-msgid "_Add"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:47
-msgid "_Archive"
-msgstr "కవిలె (_A)"
-
-#: ../../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "జోడించు (_A)"
-
-#: ../../ui/composer.glade:525
-msgid "_Attach File"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
 msgstr ""
 
-#: ../../ui/preferences.glade:69
-msgid "_Automatically select next message"
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:19
-msgid "_Cancel"
-msgstr "రద్దుచేయి (_C)"
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "కొత్త సందేశం"
 
-#: ../../ui/composer.glade:52
-msgid "_Center"
+#: ../src/client/composer/composer-widget.vala:138
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:23
-msgid "_Close"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:889
-msgid "_Copy"
-msgstr "నకలుచేయి (_C)"
-
-#: ../../src/client/geary-controller.vala:42
-msgid "_Delete"
-msgstr "తొలగించు (_D)"
-
-#: ../../ui/password-dialog.glade:548
-msgid "_Details"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:24
-msgid "_Discard"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
 msgstr ""
 
-#: ../../ui/preferences.glade:90
-msgid "_Display conversation preview"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:262
-msgid "_Donate"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
 msgstr ""
 
-#: ../../ui/login.glade:782
-msgid "_Download mail:"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
 msgstr ""
 
-#: ../../ui/composer.glade:181
-msgid "_Fixed Width"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:328
-#: ../../src/client/views/conversation-viewer.vala:1457
-msgid "_Forward"
-msgstr "మునుముందుకు (_F)"
-
-#: ../../src/client/geary-controller.vala:254
-#: ../../src/client/ui/stock.vala:25
-msgid "_Help"
-msgstr "సహాయం (_H)"
-
-#: ../../ui/composer.glade:542
-msgid "_Include Original Attachments"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:922
-msgid "_Inspect"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
 msgstr ""
 
-#: ../../ui/composer.glade:57
-msgid "_Justify"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:33
-msgid "_Keep"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:305
-msgid "_Label"
-msgstr "నామాంకం (_L)"
-
-#: ../../ui/composer.glade:42
-msgid "_Left"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1469
-msgid "_Mark as Read"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1473
-msgid "_Mark as Unread"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:271
-msgid "_Mark as..."
-msgstr "ఇలా గుర్తుపెట్టు...(_M)"
-
-#: ../../ui/composer.glade:157
-msgid "_Medium"
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:309
-msgid "_Move"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:18
-msgid "_OK"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:26
-msgid "_Open"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
 msgstr ""
 
-#: ../../ui/login.glade:131 ../../ui/login.glade:539
-#: ../../ui/password-dialog.glade:85
-msgid "_Password:"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
 msgstr ""
 
-#: ../../ui/composer.glade:35
-msgid "_Paste"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
 msgstr ""
 
-#: ../../ui/preferences.glade:172
-msgid "_Play notification sounds"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:250
-#: ../../src/client/ui/stock.vala:27
-msgid "_Preferences"
-msgstr "ప్రాధాన్యతలు (_P)"
-
-#: ../../src/client/ui/stock.vala:28
-msgid "_Print..."
-msgstr ""
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/geary-controller.vala:266
-#: ../../src/client/ui/stock.vala:29
-msgid "_Quit"
-msgstr "నిష్క్రమించు (_Q)"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/geary-controller.vala:704
-msgid "_Rebuild"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
 msgstr ""
 
-#: ../../ui/composer.glade:14
-msgid "_Redo"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:561
-msgid "_Remember passwords"
-msgstr ""
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "రద్దుచేయి (_C)"
 
-#: ../../src/client/ui/stock.vala:30
-msgid "_Remove"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1496
-msgid "_Replace"
-msgstr "ప్రతిస్థాపించు (_R)"
-
-#: ../../src/client/geary-controller.vala:317
-#: ../../src/client/views/conversation-viewer.vala:1447
-msgid "_Reply"
-msgstr "ప్రతిస్పందించు (_R)"
-
-#: ../../ui/composer.glade:141
-msgid "_Rich Text"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
 msgstr ""
 
-#: ../../ui/composer.glade:47
-msgid "_Right"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
 msgstr ""
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:31
-msgid "_Save"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1395
-msgid "_Save As..."
-msgstr "ఇలా భద్రపరుచు...(_S)"
-
-#: ../../src/client/views/conversation-viewer.vala:1414
-msgid "_Save Image As..."
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
 msgstr ""
 
-#: ../../ui/composer.glade:594
-msgid "_Send"
-msgstr "పంపు (_S)"
-
-#: ../../ui/composer.glade:163
-msgid "_Small"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:289
-msgid "_Star"
-msgstr "నక్షత్రించు (_S)"
-
-#: ../../ui/composer.glade:7
-msgid "_Undo"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
 msgstr ""
 
-#: ../../ui/login.glade:522
-msgid "_Username:"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1494
-msgid "_View Source"
-msgstr "మూలాన్ని చూడండి (_V)"
+#~ msgid "C_olor"
+#~ msgstr "రంగు (_o)"
 
-#. / 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 ""
+#~ msgid "Compose Message"
+#~ msgstr "సందేశాన్ని సృష్టించండి"
 
-#: ../../src/client/views/conversation-viewer.vala:1148
-msgid "but actually goes to"
-msgstr ""
+#~ msgid "Drop files here"
+#~ msgstr "దస్త్రాలను ఇక్కడ పడవేయండి"
 
-#: ../../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "బైట్లు"
+#~ msgid "Geary Mail"
+#~ msgstr "గేరీ వేగు"
 
-#. / Placeholder filename for attachments with no filename.
-#: ../../src/client/views/conversation-viewer.vala:1799
-#: ../../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "ఏదీకాదు"
+#~ msgid "Large"
+#~ msgstr "అతిపెద్ద"
 
-#: ../../src/client/views/conversation-find-bar.vala:226
-msgid "not found"
-msgstr ""
+#~ msgid "Medium"
+#~ msgstr "మాధ్యమం"
 
-#. / 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 "Praveen Illa <mail2ipn gmail com>, 2012."
+#~ msgid "_Delete"
+#~ msgstr "తొలగించు (_D)"
+
+#~ msgid "_Send"
+#~ msgstr "పంపు (_S)"
diff --git a/po/tr.po b/po/tr.po
index 80bd351..dd4fced 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -15,424 +15,436 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=geary&k";
-"eywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-01-09 23:12+0000\n"
-"PO-Revision-Date: 2015-02-07 06:34+0000\n"
-"Last-Translator: Simge Sezgin <simgesezgin88 gmail com>\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:12+0000\n"
+"Last-Translator: Simge Sezgin <Unknown>\n"
 "Language-Team: Türkçe <gnome-turk gnome org>\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.5.1.1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:56+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: tr\n"
 "X-POOTLE-MTIME: 1423290848.000000\n"
 
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Posta İstemcisi"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary Posta"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Eposta gönder ve al"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "E-posta;Elektronik Posta;Posta;Mektup;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "İleti oluştur"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "E-posta ile gönder"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+#| msgid "Drafts"
+msgid "Drafts | Draft"
+msgstr "Taslaklar | Taslak"
 
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Dosyaları Geary kullanarak gönderin"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
+"Gönderilmiş | Gönderilmiş Posta | Gönderilmiş Eposta | Gönderilmiş E-Posta"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_Kaydet"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
+"Önemsiz | İstenmeyen | Önemsiz Posta | Önemsiz Eposta | Toplu Posta | Toplu "
+"Eposta | Toplu E-posta"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Ekle"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Çöp | Çöp | Çöp Kutusu"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:20
-msgid "Accounts"
-msgstr "Hesaplar"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#. Copyright 2011-2014 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Adı Soyadı"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Gelen Kutusu"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-msgid "Welcome to Geary."
-msgstr "Geary'e Hoşgeldiniz."
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Taslaklar"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-msgid "Enter your account information to get started."
-msgstr "Başlamak için hesap bilginizi giriniz."
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Gönderilmiş Postalar"
 
-#: ../src/client/accounts/add-edit-page.vala:247
-msgid "2 weeks back"
-msgstr "2 hafta öncesinden"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Yıldız İşaretli"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:248
-msgid "1 month back"
-msgstr "1 ay öncesinden"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Önemli"
 
-#: ../src/client/accounts/add-edit-page.vala:249
-msgid "3 months back"
-msgstr "3 ay öncesinden"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Tüm Postalar"
 
-#: ../src/client/accounts/add-edit-page.vala:250
-msgid "6 months back"
-msgstr "6 ay öncesinden"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Gereksiz"
 
-#: ../src/client/accounts/add-edit-page.vala:251
-msgid "1 year back"
-msgstr "1 yıl öncesinden"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Çöp"
 
-#: ../src/client/accounts/add-edit-page.vala:252
-msgid "2 years back"
-msgstr "2 yıl öncesinden"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Giden Kutusu"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "4 years back"
-msgstr "4 yıl öncesinden"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Ara"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "Everything"
-msgstr "Herşey"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Arşiv"
 
-#: ../src/client/accounts/add-edit-page.vala:686
-msgid "Remem_ber passwords"
-msgstr "Parolaları _hatırla"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Hiç"
 
-#: ../src/client/accounts/add-edit-page.vala:693 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "Parolayı _hatırla"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:727
-msgid "Unable to validate:\n"
-msgstr "Doğrulanamadı:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:729
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "&#8226; Geçersiz hesap takma adı.\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:732
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; E-posta adresi zaten Geary'e eklenmiş.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:736
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "&#8226; IMAP bağlantı hatası.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:739
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "&#8226; IMAP kullanıcı adı veya parola hatalı.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Diğer"
 
-#: ../src/client/accounts/add-edit-page.vala:742
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "&#8226; SMTP bağlantı hatası.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+#| msgid "Save A_ttachment..."
+#| msgid_plural "Save All A_ttachments..."
+msgid "attachment"
+msgstr "ek"
 
-#: ../src/client/accounts/add-edit-page.vala:745
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "&#8226; SMTP kullanıcı adı veya parola hatalı.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "bcc"
 
-#: ../src/client/accounts/add-edit-page.vala:749
-msgid "        &#8226; Connection error.\n"
-msgstr "&#8226; Bağlantı hatası.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "gövde"
 
-#: ../src/client/accounts/add-edit-page.vala:753
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "&#8226; Kullanıcı adı veya parola hatalı.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+#| msgid "Bcc:"
+msgid "cc"
+msgstr "cc"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2014 Yorba Foundation"
-msgstr "Telif Hakkı 2011-2014 Yorba Foundation"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "kimden"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Yorba web sitesini ziyaret edin"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+#| msgid "Subject:"
+msgid "subject"
+msgstr "konu"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Geary'i ana pencere gizlenmiş olarak başlatın"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "kime"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Çıktı hata ayıklama bilgisi"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "ben"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Sohbet gözetimini kayda al"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(konu yok)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Ağ paralelleştirilmesini kayda al"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %b %-e, %Y at %-l:%M %p"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Ağ etkinliğini kayda al"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "%1$s tarihinde, %2$s yazdı:"
 
-#. / 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 "IMAP tekrar sırasını kayda al"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s yazdı:"
 
-#. / 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 "Ağ serileştirmeyi kayda al"
+#. / 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:234
+msgid "On %s:"
+msgstr "%s tarihinde:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Dönemsel etkinliği kayda al"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Yönlendirilen ileti ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Veritabanı sorgularını kayda al (bir çok ileti oluşturur)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Gönderen: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Klasör düzgelemeyi kayda al"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Konu: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "WebView kontrolüne izin ver"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Tarih: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "TLS uyarıları ile bütün sertifikaları iptal et"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Kime: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Uygulama sürümünü göster"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Cc: %s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Yeni bir düzenleyici pencere açmak için %s kullan"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "hiçbiri"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Lütfen yorumlarınızı,  önerilerinizi ve hataları bildirin:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Posta İstemcisi"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Komut satırı seçenekleri ayrıştırılamadı: %s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Tanınmayan komut satırı seçeneği \"%s\"\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Yorba web sitesini ziyaret edin"
 
-#: ../src/client/application/geary-controller.vala:56
-msgid "_Delete"
-msgstr "_Sil"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Konuşmayı sil (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Konuşmaları sil (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:62
-msgid "_Trash"
-msgstr "_Çöp"
-
-#: ../src/client/application/geary-controller.vala:63
-msgid "Move conversation to trash (Delete, Backspace)"
-msgstr "Konuşmayı çöpe taşı (Delete, Backspace)"
-
-#: ../src/client/application/geary-controller.vala:64
-msgid "Move conversations to trash (Delete, Backspace)"
-msgstr "Konuşmaları çöpe taşı (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr ""
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
 #: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Arşivle"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Konuşmayı arşivle (A)"
 
-#: ../src/client/application/geary-controller.vala:70
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Konuşmaları arşivle (A)"
 
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "İ_stenmeyen olarak İşaretle"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "İstenen olarak İşaretle"
 
-#: ../src/client/application/geary-controller.vala:76
-#: ../src/client/application/geary-controller.vala:296
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Konuşmayı işaretle"
 
-#: ../src/client/application/geary-controller.vala:77
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Konuşmaları işaretle"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Konuşmayı etiketle"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Konuşmaya etiket ekle"
 
-#: ../src/client/application/geary-controller.vala:80
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Daha fazla konuşma"
 
-#: ../src/client/application/geary-controller.vala:81
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Daha fazla konuşma"
 
-#: ../src/client/application/geary-controller.vala:272
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "_Hesaplar"
 
-#: ../src/client/application/geary-controller.vala:277
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "_Tercihler"
 
-#: ../src/client/application/geary-controller.vala:281
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Yardım"
 
-#: ../src/client/application/geary-controller.vala:285
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Hakkında"
 
-#: ../src/client/application/geary-controller.vala:289
-msgid "_Donate"
-msgstr "_Bağış Yap"
-
-#: ../src/client/application/geary-controller.vala:293
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Çık"
 
-#: ../src/client/application/geary-controller.vala:298
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_... olarak işaretle"
 
-#: ../src/client/application/geary-controller.vala:304
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Okundu Olarak İşa_retle"
 
-#: ../src/client/application/geary-controller.vala:310
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Ok_unmamış Olarak İşaretle"
 
-#: ../src/client/application/geary-controller.vala:316
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Yıldızla"
 
-#: ../src/client/application/geary-controller.vala:321
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "Y_ıldızı Kaldır"
 
-#: ../src/client/application/geary-controller.vala:331
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Etiket ekle"
 
-#: ../src/client/application/geary-controller.vala:332
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Etiketle"
 
-#: ../src/client/application/geary-controller.vala:336
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Taşı"
 
-#: ../src/client/application/geary-controller.vala:340
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Yeni ileti oluştur (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:344
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1751
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Yanıtla"
 
-#: ../src/client/application/geary-controller.vala:345
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Yanıtla (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:349
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "Tümüne Yanıt_Ver"
 
-#: ../src/client/application/geary-controller.vala:350
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Tümüne Yanıt Ver (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:355
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1761
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_İlet"
 
-#: ../src/client/application/geary-controller.vala:356
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Yönlendir (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:624
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Sunucu güven istisnası depolanamadı"
 
-#: ../src/client/application/geary-controller.vala:861
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Ayarlarınız emniyetsiz"
 
-#: ../src/client/application/geary-controller.vala:862
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -442,17 +454,17 @@ msgstr ""
 "kullanıcı adınız ve şifreniz ağdaki başka biri tarafından okunabilir "
 "demektir. Bunu yapmak istediğinizden emin misiniz?"
 
-#: ../src/client/application/geary-controller.vala:863
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "Devam_et"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:941
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "E-posta gönderme hatası"
 
-#: ../src/client/application/geary-controller.vala:942
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -460,14 +472,12 @@ msgstr ""
 "Geary eposta gönderilirken bir hata ile karşılaştı.  Eğer sorun devam "
 "ederse, lütfen e-postayı Giden klasöründen elle siliniz."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:946
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Gönderilmiş posta kaydedilirken hata"
 
-#: ../src/client/application/geary-controller.vala:947
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -475,20 +485,15 @@ msgstr ""
 "Geary, Gönderilmiş Postaya gönderilmiş iletiyi kaydederken bir hata ile "
 "karşılaştı.  İleti, siz silene kadar Giden Klasörünüzde kalacak."
 
-#: ../src/client/application/geary-controller.vala:1016
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Etiketler"
 
-#. 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:1028
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "%s için veritabanı açılamadı"
 
-#: ../src/client/application/geary-controller.vala:1029
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -510,21 +515,19 @@ msgstr ""
 "Veritabanının yeniden inşa edilmesi bütün yerel epostaları ve eklerini yok "
 "edecektir.<b>Sizin sunucunuzdaki postalar etkilenmeyecektir.</b>"
 
-#: ../src/client/application/geary-controller.vala:1031
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "_Yeniden Oluştur"
 
-#: ../src/client/application/geary-controller.vala:1031
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "Ç_ık"
 
-#: ../src/client/application/geary-controller.vala:1040
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "\"%s\" için veritabanı yeniden oluşturulamadı"
 
-#: ../src/client/application/geary-controller.vala:1041
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -534,17 +537,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1063
-#: ../src/client/application/geary-controller.vala:1073
-#: ../src/client/application/geary-controller.vala:1084
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "%s için yerel posta kutusu açılamadı"
 
-#: ../src/client/application/geary-controller.vala:1064
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -562,7 +561,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -576,7 +575,7 @@ msgstr ""
 "\n"
 "Lütfen Geary uygulamasının son sürümünü kurun ve tekrar deneyin."
 
-#: ../src/client/application/geary-controller.vala:1085
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -589,26 +588,31 @@ msgstr ""
 "Lütfen ağ bağlantılarınızı kontrol edin ve Geary uygulamasını yeniden "
 "başlatın."
 
-#: ../src/client/application/geary-controller.vala:1592
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "%s hakında"
 
 #. / 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-controller.vala:1595
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
 msgstr ""
 "Ferhat TUNÇTAN <ferhattnctn19 yahoo com tr>\n"
 "Yunus Burak TUNÇTAN <buraktunctan hotmail com>\n"
-"Muhammet Kara <muhammetk gmail com>"
+"Muhammet Kara <muhammetk gmail com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Simge Sezgin https://launchpad.net/~simgesezgin88";
 
-#: ../src/client/application/geary-controller.vala:1859
-#, c-format
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "\"%s\" i açmak istediğinizden emin misiniz?"
 
-#: ../src/client/application/geary-controller.vala:1860
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -616,440 +620,183 @@ msgstr ""
 "Eklerin açılması sisteminizin zarar görmesine neden olabilir.  Yalnızca "
 "güvendiğiniz kaynaklardan gelen dosyaları açın."
 
-#: ../src/client/application/geary-controller.vala:1861
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Tekrar_sorma"
 
-#: ../src/client/application/geary-controller.vala:1879
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr ""
 "\"%s\" isimli bir dosya zaten var  Bunu varolanla değiştirmek istiyor "
 "musunuz?"
 
-#: ../src/client/application/geary-controller.vala:1881
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "Dosya \"%s\"'in içinde zaten var.  Bunu varolanla değiştirmek, içeriğini "
 "üzerine yazacak."
 
-#: ../src/client/application/geary-controller.vala:1884
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Değiştir"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2166
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Açık taslak iletiler kapatılsın mı?"
 
-#: ../src/client/application/geary-controller.vala:2269
-msgid "Do you want to permanently delete this message?"
-msgid_plural "Do you want to permanently delete these messages?"
-msgstr[0] "Bu ileti(ler)i kalıcı olarak silmek istiyor musunuz?"
-
-#: ../src/client/application/geary-controller.vala:2271
-msgid "Delete"
-msgstr "Sil"
-
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i eşleşir"
-
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i eşleşir (paket)"
-
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "bulunamadı"
-
-#: ../src/client/components/main-toolbar.vala:11
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Ara"
-
-#. Search bar.
-#: ../src/client/components/main-toolbar.vala:78
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Anahtar kelimeler için hesaptaki bütün postaları ara (Ctrl+S)"
-
-#: ../src/client/components/main-toolbar.vala:210
-#, c-format
-msgid "Indexing %s account"
-msgstr "%s hesabı indeksleniyor"
-
-#: ../src/client/components/main-toolbar.vala:221
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "%s hesabını ara"
-
-#: ../src/client/components/main-window.vala:347
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Gönderiliyor..."
-
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_Tamam"
-
-#: ../src/client/components/stock.vala:19 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_İptal et"
-
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Kapat"
-
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Vazgeç"
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Aç"
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Yazdır..."
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
+msgstr ""
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "_Kaldır"
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1218
-msgid "Select _All"
-msgstr "Hepsini _Seç"
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
+msgstr ""
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Sakla"
+#: ../src/client/application/geary-controller.vala:2489
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] "Bu ileti(ler)i kalıcı olarak silmek istiyor musunuz?"
 
-#: ../src/client/composer/composer-widget.vala:58
-msgid "Saved"
-msgstr "Kaydedildi"
+#: ../src/client/application/geary-controller.vala:2491
+msgid "Delete"
+msgstr "Sil"
 
-#: ../src/client/composer/composer-widget.vala:59
-msgid "Saving"
-msgstr "Kaydediliyor"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:60
-msgid "Error saving"
-msgstr "Kaydedilirken hata"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
+msgstr ""
 
-#. A 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:121
-msgid ""
-"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
-"enclosing|encloses|enclosure|enclosures"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
 msgstr ""
-"ekle|ekleniyor|ekler|ek|ekler|eklendi|içer|içerdi|içeriyor|içerir|koruncak|ko"
-"runcaklar"
 
-#: ../src/client/composer/composer-widget.vala:907
-msgid "Do you want to discard the unsaved message?"
-msgstr "Kaydedilmemiş iletiyi iptal etmek istiyor musunuz?"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Geary'i ana pencere gizlenmiş olarak başlatın"
 
-#: ../src/client/composer/composer-widget.vala:910
-#: ../src/client/composer/composer-widget.vala:914
-msgid "Do you want to discard this message?"
-msgstr "Bu iletiden vazgeçmek istiyor musunuz?"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Çıktı hata ayıklama bilgisi"
 
-#: ../src/client/composer/composer-widget.vala:1027
-msgid "Send message with an empty subject and body?"
-msgstr "İleti konusu ve gövdesi olmadan gönderilsin mi?"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Sohbet gözetimini kayda al"
 
-#: ../src/client/composer/composer-widget.vala:1029
-msgid "Send message with an empty subject?"
-msgstr "İleti konusu olmadan gönderilsin mi?"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Ağ paralelleştirilmesini kayda al"
 
-#: ../src/client/composer/composer-widget.vala:1031
-msgid "Send message with an empty body?"
-msgstr "İleti, ileti gövdesi olmadan gönderilsin mi?"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Ağ etkinliğini kayda al"
 
-#: ../src/client/composer/composer-widget.vala:1033
-msgid "Send message without an attachment?"
-msgstr "İleti eki olmadan gönderilsin mi?"
+#. / 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 "IMAP tekrar sırasını kayda al"
 
-#: ../src/client/composer/composer-widget.vala:1216
-msgid "Cannot add attachment"
-msgstr "Eklenti eklenemiyor"
+#. / 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 "Ağ serileştirmeyi kayda al"
 
-#: ../src/client/composer/composer-widget.vala:1227
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "\"%s\" bulunamadı."
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Dönemsel etkinliği kayda al"
 
-#: ../src/client/composer/composer-widget.vala:1234
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" bir klasör."
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Veritabanı sorgularını kayda al (bir çok ileti oluşturur)"
 
-#: ../src/client/composer/composer-widget.vala:1241
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" boş bir dosya."
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Klasör düzgelemeyi kayda al"
 
-#: ../src/client/composer/composer-widget.vala:1255
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "\"%s\" okuma için açılamadı."
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "WebView kontrolüne izin ver"
 
-#: ../src/client/composer/composer-widget.vala:1262
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" gönderim için zaten eklendi."
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "TLS uyarıları ile bütün sertifikaları iptal et"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1271
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Uygulama sürümünü göster"
 
-#: ../src/client/composer/composer-widget.vala:1331
-msgid "To: "
-msgstr "Kime: "
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Yeni bir düzenleyici pencere açmak için %s kullan"
 
-#: ../src/client/composer/composer-widget.vala:1334
-msgid "Cc: "
-msgstr "Cc: "
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Lütfen yorumlarınızı,  önerilerinizi ve hataları bildirin:"
 
-#: ../src/client/composer/composer-widget.vala:1337
-msgid "Bcc: "
-msgstr "Bcc:"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Komut satırı seçenekleri ayrıştırılamadı: %s\n"
 
-#: ../src/client/composer/composer-widget.vala:1340
-#| msgid "_Reply"
-msgid "Reply-To: "
-msgstr "Yanıtla: "
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Tanınmayan komut satırı seçeneği \"%s\"\n"
 
-#: ../src/client/composer/composer-widget.vala:1573
-msgid "Select Color"
-msgstr "Renk Seç"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - Yeni İleti"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2022
-msgid "_From:"
-msgstr "_Gönderen:"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d yeni mesaj"
 
-#. For other types of messages, just show the from account.
-#. Composer label (without mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2038
-#: ../src/client/conversation-viewer/conversation-viewer.vala:734
-msgid "From:"
-msgstr "Gönderen:"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d toplam yeni ileti"
 
-#. Copyright 2011-2014 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Window for sending messages.
-#: ../src/client/composer/composer-window.vala:10
-msgid "New Message"
-msgstr "Yeni İleti"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d yeni diğer ileti %s için)"
+
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Aç"
 
 #: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Ben"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:338
-msgid "No conversations selected."
-msgstr "Hiçbir görüşme seçilmedi."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:340
-#, c-format
-msgid "%u conversation selected."
-msgid_plural "%u conversations selected."
-msgstr[0] "%u konuşmala seçildi."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:369
-msgid "No search results found."
-msgstr "Hiç arama sonucu bulunamadı."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:371
-msgid "No conversations in folder."
-msgstr "Klasörde hiç konuşma yok."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:633
-msgid "This message contains remote images."
-msgstr "Bu iletide uzak resimler bulunuyor."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:633
-msgid "Show Images"
-msgstr "Resimleri Göster"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:634
-msgid "Always Show From Sender"
-msgstr "Her Zaman Gönderenden Göster"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:658
-msgid "Edit Draft"
-msgstr "Taslağı Düzenle"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:737
-msgid "To:"
-msgstr "Kime:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:740
-msgid "Cc:"
-msgstr "Cc:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:743
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:746
-msgid "Subject:"
-msgstr "Konu:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:749
-msgid "Date:"
-msgstr "Tarih:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1033
-#, c-format
-msgid "%u read message"
-msgid_plural "%u read messages"
-msgstr[0] "%u okunmuş ileti"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1165
-#, c-format
-msgid "This message was sent successfully, but could not be saved to %s."
-msgstr "Bu ileti başarıyla gönderildi, fakat %s'e kaydedilemedi."
-
-#. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1191
-#: ../ui/composer.glade.h:4
-msgid "_Copy"
-msgstr "_Kopyala"
-
-#. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1199
-msgid "Copy _Email Address"
-msgstr "Kopyala _Eposta Adresi"
-
-#. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1204
-#: ../ui/composer.glade.h:17
-msgid "Copy _Link"
-msgstr "Kopyala _Bağlantı"
-
-#. Select message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1212
-msgid "Select _Message"
-msgstr "_İleti Seçin"
-
-#. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1224
-msgid "_Inspect"
-msgstr "_İncele"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1450
-msgid "This link appears to go to"
-msgstr "Bu bağlantı şuraya gitmek için görünür"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1451
-msgid "but actually goes to"
-msgstr "aslında şuraya gider"
-
-#. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1506
-msgid " (Invalid?)"
-msgstr " (Geçersiz?)"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
-msgid "_Save Image As..."
-msgstr "Görüntüyü Farklı _Kaydet..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1716
-msgid "_Save As..."
-msgstr "_... Olarak Kaydet"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1721
-msgid "Save All A_ttachments..."
-msgstr "Tüm E_klentileri Kaydet..."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1741
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "E_klentiyi kaydet..."
-
-#. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1756
-msgid "Reply to _All"
-msgstr "Tümüne _Yanıt Ver"
-
-#. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1773
-msgid "_Mark as Read"
-msgstr "_Okunmuş olarak işaretle"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1777
-msgid "_Mark as Unread"
-msgstr "_Okunmamış olarak işaretle"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1783
-msgid "Mark Unread From _Here"
-msgstr "_Buradan Okunmamış İşaretle"
-
-#. Separator.
-#. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1798
-msgid "_View Source"
-msgstr "_Kaynağı Görüntüle"
-
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2120
-#: ../src/engine/rfc822/rfc822-utils.vala:331
-msgid "none"
-msgstr "hiçbiri"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2255
-msgid "Failed to open default text editor."
-msgstr "Varsayılan metin düzenleyici açılamadı."
-
-#: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - Sohbet Araştırıcısı"
-
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Bir dosya seçin"
-
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Ekle"
-
 #: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
 msgid "Untrusted Connection: %s"
 msgstr "Güvenilir Olmayan Bağlantı: %s"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
 msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr "%s konumundaki %s posta sunucusu kimliği:%u onaylanamadı."
 
@@ -1121,78 +868,133 @@ msgstr "Sunucunun sertifikası güvensiz kabul ediliyor"
 msgid "An error has occurred processing the server's certificate"
 msgstr "Sunucu sertifikası işlenirken bir hata oluştu"
 
-#. 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 devam etmek için eposta parolanızı istiyor"
 
-#. 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 ileti"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Bir dosya seçin"
 
-#. / 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 okunmamış"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Ekle"
 
-#. / 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/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr ""
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Gelen Kutusu"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Hesaplar"
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d sonuç"
+#. / 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 "Adı Soyadı"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Yeni İleti"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Geary'e Hoşgeldiniz."
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d yeni mesaj"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Başlamak için hesap bilginizi giriniz."
 
-#: ../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 toplam yeni ileti"
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 hafta öncesinden"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 yeni diğer ileti %s için)"
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 ay öncesinden"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Aç"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 ay öncesinden"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 ay öncesinden"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 yıl öncesinden"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "2 yıl öncesinden"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "4 yıl öncesinden"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Herşey"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "Parolaları _hatırla"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "Parolayı _hatırla"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Doğrulanamadı:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Geçersiz hesap takma adı.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; E-posta adresi zaten Geary'e eklenmiş.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; IMAP bağlantı hatası.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; IMAP kullanıcı adı veya parola hatalı.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; SMTP bağlantı hatası.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; SMTP kullanıcı adı veya parola hatalı.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Bağlantı hatası.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Kullanıcı adı veya parola hatalı.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Kaydet"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Ekle"
 
 #. / 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
@@ -1250,13 +1052,11 @@ msgid "Now"
 msgstr "Şimdi"
 
 #: ../src/client/util/util-date.vala:167
-#, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
 msgstr[0] "%dm önce"
 
 #: ../src/client/util/util-date.vala:171
-#, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
 msgstr[0] "%dh önce"
@@ -1268,15 +1068,9 @@ msgstr "Dün"
 #. / 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:30
-#: ../src/engine/rfc822/rfc822-message.vala:747
-msgid "(no subject)"
-msgstr "(konu yok)"
-
 #: ../src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "bytes"
@@ -1301,721 +1095,774 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KB"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d ileti"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d okunmamış"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Gelen Kutusu"
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "%s hesabını ara"
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Diğer"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d sonuç"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Gelen Kutusu"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "Hiçbir görüşme seçilmedi."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Taslaklar"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] "%u konuşmala seçildi."
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Gönderilmiş Postalar"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
+msgstr "Hiç arama sonucu bulunamadı."
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Yıldız İşaretli"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
+msgstr "Klasörde hiç konuşma yok."
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Önemli"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
+msgstr "Bu iletide uzak resimler bulunuyor."
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Tüm Postalar"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr "Resimleri Göster"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Gereksiz"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
+msgstr "Her Zaman Gönderenden Göster"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Çöp"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
+msgstr "Taslağı Düzenle"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Giden Kutusu"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "Gönderen:"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Arşiv"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "Kime:"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:25
-msgid "None"
-msgstr "Hiç"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Cc:"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:665
-#| msgid "Save A_ttachment..."
-#| msgid_plural "Save All A_ttachments..."
-msgid "attachment"
-msgstr "ek"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Bcc:"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:669
-#: ../src/engine/imap-db/imap-db-account.vala:693
-msgid "bcc"
-msgstr "bcc"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "Konu:"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:673
-msgid "body"
-msgstr "gövde"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Tarih:"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:677
-#: ../src/engine/imap-db/imap-db-account.vala:693
-#| msgid "Bcc:"
-msgid "cc"
-msgstr "cc"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] "%u okunmuş ileti"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:681
-#: ../src/engine/imap-db/imap-db-account.vala:693
-msgid "from"
-msgstr "kimden"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
+msgstr "Bu ileti başarıyla gönderildi, fakat %s'e kaydedilemedi."
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:685
-#| msgid "Subject:"
-msgid "subject"
-msgstr "konu"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "_Kopyala"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:689
-#: ../src/engine/imap-db/imap-db-account.vala:693
-msgid "to"
-msgstr "kime"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "Kopyala _Eposta Adresi"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:709
-msgid "me"
-msgstr "ben"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "Kopyala _Bağlantı"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:561
-#| msgid "Drafts"
-msgid "Drafts | Draft"
-msgstr "Taslaklar | Taslak"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
+msgstr "_İleti Seçin"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:566
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Hepsini _Seç"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "_İncele"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr "Bu bağlantı şuraya gitmek için görünür"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
+msgstr "aslında şuraya gider"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
+msgstr " (Geçersiz?)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
+msgstr "Görüntüyü Farklı _Kaydet..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_... Olarak Kaydet"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "Tüm E_klentileri Kaydet..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] "E_klentiyi kaydet..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "Tümüne _Yanıt Ver"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "_Okunmuş olarak işaretle"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "_Okunmamış olarak işaretle"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
+msgstr "_Buradan Okunmamış İşaretle"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "_Kaynağı Görüntüle"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "Varsayılan metin düzenleyici açılamadı."
+
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr "%s - Sohbet Araştırıcısı"
+
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Kaydedildi"
+
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Kaydediliyor"
+
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Kaydedilirken hata"
+
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
 msgstr ""
-"Gönderilmiş | Gönderilmiş Posta | Gönderilmiş Eposta | Gönderilmiş E-Posta"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:571
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Yeni İleti"
+
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Önemsiz | İstenmeyen | Önemsiz Posta | Önemsiz Eposta | Toplu Posta | Toplu "
-"Eposta | Toplu E-posta"
+"ekle|ekleniyor|ekler|ek|ekler|eklendi|içer|içerdi|içeriyor|içerir|koruncak|ko"
+"runcaklar"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:576
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Çöp | Çöp | Çöp Kutusu"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Bu iletiden vazgeçmek istiyor musunuz?"
 
-#. / 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:168
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %b %-e, %Y at %-l:%M %p"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "İleti konusu ve gövdesi olmadan gönderilsin mi?"
 
-#. / 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:174
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "%1$s tarihinde, %2$s yazdı:"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "İleti konusu olmadan gönderilsin mi?"
 
-#. / 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:181
-#, c-format
-msgid "%s wrote:"
-msgstr "%s yazdı:"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "İleti, ileti gövdesi olmadan gönderilsin mi?"
 
-#. / 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:187
-#, c-format
-msgid "On %s:"
-msgstr "%s tarihinde:"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "İleti eki olmadan gönderilsin mi?"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:216
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Yönlendirilen ileti ----------"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Eklenti eklenemiyor"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "From: %s\n"
-msgstr "Gönderen: %s\n"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "\"%s\" bulunamadı."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:221
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Konu: %s\n"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" bir klasör."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:222
-#, c-format
-msgid "Date: %s\n"
-msgstr "Tarih: %s\n"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" boş bir dosya."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:225
-#, c-format
-msgid "To: %s\n"
-msgstr "Kime: %s\n"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "\"%s\" okuma için açılamadı."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:228
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Cc: %s\n"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "\"%s\" gönderim için zaten eklendi."
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">Hesap kaldırılamadı</span> "
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Kime: "
+
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Cc: "
+
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Bcc: "
+
+#: ../src/client/composer/composer-widget.vala:1654
+#| msgid "_Reply"
+msgid "Reply-To: "
+msgstr "Yanıtla: "
+
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Renk Seç"
+
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
 msgstr ""
-"Bu hesapla bağlantılı bir ileti penceresi açık. İletiyi gönderip veya iptal "
-"edip yeniden deneyin."
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Hesap ekle"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_Gönderen:"
+
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Gönderiliyor..."
+
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i eşleşir"
+
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i eşleşir (paket)"
+
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "bulunamadı"
+
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_Tamam"
+
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_İptal et"
+
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Kapat"
+
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Vazgeç"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Hesabu düzenle"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Aç"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Hesabı sil"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Yazdır..."
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Lütfen Geary hesabınızı doğrulayana kadar bekleyin."
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "_Kaldır"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Güvenilir Olmayan Bağlantı"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Sakla"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "Bu Sunucuya _Her Zaman Güven"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Anahtar kelimeler için hesaptaki bütün postaları ara (Ctrl+S)"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "Bu Sunucuya _Güven"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "%s hesabı indeksleniyor"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "Bu Sunucuya _Güvenme"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Geri Al"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary Posta"
 
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "_Tekrarla"
+#~ msgid "Send and receive email"
+#~ msgstr "Eposta gönder ve al"
 
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "Ke_s"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "E-posta;Elektronik Posta;Posta;Mektup;"
 
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "_Yapıştır"
+#~ msgid "Compose Message"
+#~ msgstr "İleti oluştur"
 
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_Sol"
+#~ msgid "Send by email"
+#~ msgstr "E-posta ile gönder"
 
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_Sağ"
+#~ msgid "Send files using Geary"
+#~ msgstr "Dosyaları Geary kullanarak gönderin"
 
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Merkez"
+#~ msgid "Copyright 2011-2014 Yorba Foundation"
+#~ msgstr "Telif Hakkı 2011-2014 Yorba Foundation"
 
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "_Doğrula"
+#~ msgid "_Delete"
+#~ msgstr "_Sil"
 
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Bağlantı (Ctrl+L)"
+#~ msgid "_Trash"
+#~ msgstr "_Çöp"
 
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "R_enk"
+#~ msgid "Move conversation to trash (Delete, Backspace)"
+#~ msgstr "Konuşmayı çöpe taşı (Delete, Backspace)"
 
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Daha fazla seçenek"
+#~ msgid "Move conversations to trash (Delete, Backspace)"
+#~ msgstr "Konuşmaları çöpe taşı (Delete, Backspace, A)"
 
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Metni alıntıla  (Ctrl+])"
+#~ msgid "_Donate"
+#~ msgstr "_Bağış Yap"
 
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Metni alıntı durumundan çıkar (Ctrl+[)"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Kaydedilmemiş iletiyi iptal etmek istiyor musunuz?"
 
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Biçimlendirmeyi kaldır (Ctrl+Boşluk)"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Hesap kaldırılamadı</span> "
 
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "_Biçimlendirerek Yapıştır"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Kalın (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "İtalik (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Altı Çizili (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Üstü Çizili (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "_Zengin Metin"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "Genişletilmiş Alanları Göster"
-
-#: ../ui/composer.glade.h:24
-msgid "Lar_ge"
-msgstr "Gen_iş"
-
-#: ../ui/composer.glade.h:25
-msgid "Large"
-msgstr "Büyük"
-
-#: ../ui/composer.glade.h:26
-msgid "_Medium"
-msgstr "_Orta"
-
-#: ../ui/composer.glade.h:27
-msgid "Medium"
-msgstr "Orta"
-
-#: ../ui/composer.glade.h:28
-msgid "_Small"
-msgstr "_Küçük"
-
-#: ../ui/composer.glade.h:29
-msgid "Small"
-msgstr "Küçük"
-
-#: ../ui/composer.glade.h:30
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
-
-#: ../ui/composer.glade.h:31
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: ../ui/composer.glade.h:32
-msgid "S_erif"
-msgstr "S_erif"
-
-#: ../ui/composer.glade.h:33
-msgid "Serif"
-msgstr "Serif"
-
-#: ../ui/composer.glade.h:34
-msgid "_Fixed Width"
-msgstr "_Sabit Genişlik"
-
-#: ../ui/composer.glade.h:35
-msgid "Fixed Width"
-msgstr "Sabit Genişlik"
-
-#: ../ui/composer.glade.h:36
-#| msgid "_Attach"
-msgid "Detach"
-msgstr "Ayır"
-
-#: ../ui/composer.glade.h:37
-msgid "_Send"
-msgstr "_Gönder"
-
-#: ../ui/composer.glade.h:38
-#| msgid "_Send"
-msgid "Send"
-msgstr "Gönder"
-
-#: ../ui/composer.glade.h:39
-msgid "_Attach File"
-msgstr "Dosya _Ekle"
-
-#: ../ui/composer.glade.h:40
-#| msgid "_Attach File"
-msgid "Attach File"
-msgstr "Dosya Ekle"
-
-#: ../ui/composer.glade.h:41
-msgid "_Include Original Attachments"
-msgstr "Özgün Ekler _İçer"
-
-#: ../ui/composer.glade.h:42
-msgid "Include Original Attachments"
-msgstr "Özgün Ekler İçer"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:44
-#| msgid "To:"
-msgid "_To"
-msgstr "_Kime"
-
-#: ../ui/composer.glade.h:45
-#| msgid "Cc:"
-msgid "_Cc"
-msgstr "_Cc"
-
-#: ../ui/composer.glade.h:46
-#| msgid "Subject:"
-msgid "_Subject"
-msgstr "_Konu"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Bu hesapla bağlantılı bir ileti penceresi açık. İletiyi gönderip veya iptal "
+#~ "edip yeniden deneyin."
 
-#: ../ui/composer.glade.h:47
-msgid "_Bcc"
-msgstr "_Konu"
+#~ msgid "Add account"
+#~ msgstr "Hesap ekle"
 
-#: ../ui/composer.glade.h:48
-#| msgid "_Reply"
-msgid "_Reply-To"
-msgstr "_Yanıtla"
+#~ msgid "Edit account"
+#~ msgstr "Hesabu düzenle"
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:50
-#| msgid "From:"
-msgid "From"
-msgstr "Gönderen"
-
-#: ../ui/composer.glade.h:51
-msgid "Drop files here"
-msgstr "Dosyaları buraya bırak"
-
-#: ../ui/composer.glade.h:52
-msgid "To add them as attachments"
-msgstr "Onları ek olarak eklemek için"
-
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Bul:"
-
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Önceki"
-
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Sonraki"
-
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Büyük küçük harf duyarlı"
-
-#: ../ui/find_bar.glade.h:5
-#| msgid "Labels"
-msgid "label"
-msgstr "etiket"
-
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "Parola"
-
-#: ../ui/login.glade.h:2
-#| msgid "Email address:"
-msgid "E_mail address"
-msgstr "E_posta adresi"
-
-#: ../ui/login.glade.h:3
-#| msgid "_Password:"
-msgid "_Password"
-msgstr "_Parola"
-
-#: ../ui/login.glade.h:4
-#| msgid "Service:"
-msgid "S_ervice"
-msgstr "H_izmet"
-
-#: ../ui/login.glade.h:5
-#| msgid "N_ame:"
-msgid "N_ame"
-msgstr "İ_sim"
-
-#: ../ui/login.glade.h:7
-#| msgid "N_ickname:"
-msgid "N_ickname"
-msgstr "Takma Ad"
-
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "İş, Ev, vs."
-
-#: ../ui/login.glade.h:9
-#| msgid "Sent Mail"
-msgid "_Save sent mail"
-msgstr "Gönderilmiş postayı _kaydet"
-
-#: ../ui/login.glade.h:10
-msgid "IMAP settings"
-msgstr "IMAP ayarları"
-
-#: ../ui/login.glade.h:11
-#| msgid "Se_rver:"
-msgid "Se_rver"
-msgstr "Su_nucu"
-
-#: ../ui/login.glade.h:12
-#| msgid "P_ort:"
-msgid "P_ort"
-msgstr "P_ort"
-
-#: ../ui/login.glade.h:13
-#| msgid "Ser_ver:"
-msgid "Ser_ver"
-msgstr "Sun_ucu"
-
-#: ../ui/login.glade.h:14
-#| msgid "Por_t:"
-msgid "Por_t"
-msgstr "Por_t"
-
-#: ../ui/login.glade.h:15
-msgid "SMTP settings"
-msgstr "SMTP ayarları"
-
-#: ../ui/login.glade.h:16
-#| msgid "User_name:"
-msgid "User_name"
-msgstr "Kullanıcı_adı"
-
-#: ../ui/login.glade.h:17
-#| msgid "Pass_word:"
-msgid "Pass_word"
-msgstr "Paro_la"
-
-#: ../ui/login.glade.h:18
-msgid "SMTP username"
-msgstr "SMTP kullanıcı adı"
-
-#: ../ui/login.glade.h:19
-msgid "SMTP password"
-msgstr "SMTP parola"
-
-#: ../ui/login.glade.h:20
-#| msgid "_Username:"
-msgid "_Username"
-msgstr "_Kullanıcı adı"
-
-#: ../ui/login.glade.h:21
-msgid "IMAP username"
-msgstr "IMAP kullanıcı adı"
-
-#: ../ui/login.glade.h:22
-msgid "IMAP password"
-msgstr "IMAP parola"
-
-#: ../ui/login.glade.h:23
-#| msgid "Encr_yption:"
-msgid "Encr_yption"
-msgstr "Şif_releme"
-
-#: ../ui/login.glade.h:24
-#| msgid "Encrypt_ion:"
-msgid "Encrypt_ion"
-msgstr "Şifrele_me"
-
-#: ../ui/login.glade.h:26
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
-
-#: ../ui/login.glade.h:27
-msgid "STARTTLS"
-msgstr "STARTTLS"
-
-#: ../ui/login.glade.h:28
-msgid "No authentication re_quired"
-msgstr "Kimlik doğrulama ge_rekli değil"
-
-#: ../ui/login.glade.h:29
-#| msgid "IMAP Credentials"
-msgid "Use IMAP cre_dentials"
-msgstr "IMAP kim_lik bilgilerini kullan"
-
-#: ../ui/login.glade.h:30
-msgid "Storage"
-msgstr "Depolama"
-
-#: ../ui/login.glade.h:31
-#| msgid "_Download mail:"
-msgid "_Download mail"
-msgstr "Posta _indir"
-
-#: ../ui/login.glade.h:32 ../ui/preferences.glade.h:4
-msgid "Composer"
-msgstr "Yazar"
-
-#: ../ui/login.glade.h:33
-msgid "Save dra_fts on server"
-msgstr "Sunucudaki tas_lakları kaydet"
-
-#: ../ui/login.glade.h:34
-msgid "Si_gn emails:"
-msgstr "Epostaları im_zala:"
-
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "SMTP Referansı"
-
-#: ../ui/password-dialog.glade.h:2
-#| msgid "Username:"
-msgid "Username"
-msgstr "Kullanıcı adı"
-
-#: ../ui/password-dialog.glade.h:4
-#| msgid "_Remember passwords"
-msgid "_Remember password"
-msgstr "Parolayı _hatırla"
+#~ msgid "Remove account"
+#~ msgstr "Hesabı sil"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "_Kimlik Doğrula"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Lütfen Geary hesabınızı doğrulayana kadar bekleyin."
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "Okunuyor"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Güvenilir Olmayan Bağlantı"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "_Otomatik olarak bir sonraki mesajı seç"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "Bu Sunucuya _Her Zaman Güven"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "Konuşma önizleme _görüntüle"
+#~ msgid "_Trust This Server"
+#~ msgstr "Bu Sunucuya _Güven"
 
-#: ../ui/preferences.glade.h:5
-msgid "Enable _spell checking"
-msgstr "_İmla denetimini etkinleştir"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "Bu Sunucuya _Güvenme"
 
-#: ../ui/preferences.glade.h:6
-msgid "Notifications"
-msgstr "Bildirimler"
+#~ msgid "_Undo"
+#~ msgstr "_Geri Al"
 
-#: ../ui/preferences.glade.h:7
-msgid "_Play notification sounds"
-msgstr "Bildirim seslerini _oynat"
+#~ msgid "_Redo"
+#~ msgstr "_Tekrarla"
 
-#: ../ui/preferences.glade.h:8
-msgid "Show _notifications for new mail"
-msgstr "Yeni e-postalar için _bildirimleri göster"
+#~ msgid "Cu_t"
+#~ msgstr "Ke_s"
 
-#: ../ui/preferences.glade.h:9
-msgid "Notify of new mail at start_up"
-msgstr "Başlangıç_ta yeni posta bildir"
+#~ msgid "_Paste"
+#~ msgstr "_Yapıştır"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Bu hesabı kaldırmak istediğinizden "
-"emin misiniz?</span> "
+#~ msgid "_Left"
+#~ msgstr "_Sol"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Bu hesapla ilişkili tüm letiler bilgisayarınızdan kaldırılacak. Bu işlem "
-"sunucudaki iletilerinizi etkilemeyecek."
+#~ msgid "_Right"
+#~ msgstr "_Sağ"
+
+#~ msgid "_Center"
+#~ msgstr "_Merkez"
+
+#~ msgid "_Justify"
+#~ msgstr "_Doğrula"
+
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Bağlantı (Ctrl+L)"
+
+#~ msgid "C_olor"
+#~ msgstr "R_enk"
+
+#~ msgid "More options"
+#~ msgstr "Daha fazla seçenek"
+
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Metni alıntıla  (Ctrl+])"
+
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Metni alıntı durumundan çıkar (Ctrl+[)"
+
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Biçimlendirmeyi kaldır (Ctrl+Boşluk)"
+
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "_Biçimlendirerek Yapıştır"
+
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Kalın (Ctrl+B)"
+
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "İtalik (Ctrl+I)"
+
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Altı Çizili (Ctrl+U)"
+
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Üstü Çizili (Ctrl+K)"
+
+#~ msgid "_Rich Text"
+#~ msgstr "_Zengin Metin"
+
+#~ msgid "Show Extended Fields"
+#~ msgstr "Genişletilmiş Alanları Göster"
+
+#~ msgid "Lar_ge"
+#~ msgstr "Gen_iş"
+
+#~ msgid "Large"
+#~ msgstr "Büyük"
+
+#~ msgid "_Medium"
+#~ msgstr "_Orta"
+
+#~ msgid "Medium"
+#~ msgstr "Orta"
+
+#~ msgid "_Small"
+#~ msgstr "_Küçük"
+
+#~ msgid "Small"
+#~ msgstr "Küçük"
+
+#~ msgid "S_ans Serif"
+#~ msgstr "S_ans Serif"
+
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
+
+#~ msgid "S_erif"
+#~ msgstr "S_erif"
+
+#~ msgid "Serif"
+#~ msgstr "Serif"
+
+#~ msgid "_Fixed Width"
+#~ msgstr "_Sabit Genişlik"
+
+#~ msgid "Fixed Width"
+#~ msgstr "Sabit Genişlik"
+
+#~| msgid "_Attach"
+#~ msgid "Detach"
+#~ msgstr "Ayır"
+
+#~ msgid "_Send"
+#~ msgstr "_Gönder"
+
+#~| msgid "_Send"
+#~ msgid "Send"
+#~ msgstr "Gönder"
+
+#~ msgid "_Attach File"
+#~ msgstr "Dosya _Ekle"
+
+#~| msgid "_Attach File"
+#~ msgid "Attach File"
+#~ msgstr "Dosya Ekle"
+
+#~ msgid "_Include Original Attachments"
+#~ msgstr "Özgün Ekler _İçer"
+
+#~ msgid "Include Original Attachments"
+#~ msgstr "Özgün Ekler İçer"
+
+#~| msgid "To:"
+#~ msgid "_To"
+#~ msgstr "_Kime"
+
+#~| msgid "Cc:"
+#~ msgid "_Cc"
+#~ msgstr "_Cc"
+
+#~| msgid "Subject:"
+#~ msgid "_Subject"
+#~ msgstr "_Konu"
+
+#~ msgid "_Bcc"
+#~ msgstr "_Konu"
+
+#~| msgid "_Reply"
+#~ msgid "_Reply-To"
+#~ msgstr "_Yanıtla"
+
+#~| msgid "From:"
+#~ msgid "From"
+#~ msgstr "Gönderen"
+
+#~ msgid "Drop files here"
+#~ msgstr "Dosyaları buraya bırak"
+
+#~ msgid "To add them as attachments"
+#~ msgstr "Onları ek olarak eklemek için"
+
+#~ msgid "Find:"
+#~ msgstr "Bul:"
+
+#~ msgid "_Previous"
+#~ msgstr "_Önceki"
+
+#~ msgid "_Next"
+#~ msgstr "_Sonraki"
+
+#~ msgid "_Case sensitive"
+#~ msgstr "_Büyük küçük harf duyarlı"
+
+#~| msgid "Labels"
+#~ msgid "label"
+#~ msgstr "etiket"
+
+#~ msgid "Password"
+#~ msgstr "Parola"
+
+#~| msgid "Email address:"
+#~ msgid "E_mail address"
+#~ msgstr "E_posta adresi"
+
+#~| msgid "_Password:"
+#~ msgid "_Password"
+#~ msgstr "_Parola"
+
+#~| msgid "Service:"
+#~ msgid "S_ervice"
+#~ msgstr "H_izmet"
+
+#~| msgid "N_ame:"
+#~ msgid "N_ame"
+#~ msgstr "İ_sim"
+
+#~| msgid "N_ickname:"
+#~ msgid "N_ickname"
+#~ msgstr "Takma Ad"
+
+#~ msgid "Work, Home, etc."
+#~ msgstr "İş, Ev, vs."
+
+#~| msgid "Sent Mail"
+#~ msgid "_Save sent mail"
+#~ msgstr "Gönderilmiş postayı _kaydet"
+
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP ayarları"
+
+#~| msgid "Se_rver:"
+#~ msgid "Se_rver"
+#~ msgstr "Su_nucu"
+
+#~| msgid "P_ort:"
+#~ msgid "P_ort"
+#~ msgstr "P_ort"
+
+#~| msgid "Ser_ver:"
+#~ msgid "Ser_ver"
+#~ msgstr "Sun_ucu"
+
+#~| msgid "Por_t:"
+#~ msgid "Por_t"
+#~ msgstr "Por_t"
+
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP ayarları"
+
+#~| msgid "User_name:"
+#~ msgid "User_name"
+#~ msgstr "Kullanıcı_adı"
+
+#~| msgid "Pass_word:"
+#~ msgid "Pass_word"
+#~ msgstr "Paro_la"
+
+#~ msgid "SMTP username"
+#~ msgstr "SMTP kullanıcı adı"
+
+#~ msgid "SMTP password"
+#~ msgstr "SMTP parola"
+
+#~| msgid "_Username:"
+#~ msgid "_Username"
+#~ msgstr "_Kullanıcı adı"
+
+#~ msgid "IMAP username"
+#~ msgstr "IMAP kullanıcı adı"
+
+#~ msgid "IMAP password"
+#~ msgstr "IMAP parola"
+
+#~| msgid "Encr_yption:"
+#~ msgid "Encr_yption"
+#~ msgstr "Şif_releme"
+
+#~| msgid "Encrypt_ion:"
+#~ msgid "Encrypt_ion"
+#~ msgstr "Şifrele_me"
+
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
+
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
+
+#~ msgid "No authentication re_quired"
+#~ msgstr "Kimlik doğrulama ge_rekli değil"
+
+#~| msgid "IMAP Credentials"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "IMAP kim_lik bilgilerini kullan"
+
+#~ msgid "Storage"
+#~ msgstr "Depolama"
+
+#~| msgid "_Download mail:"
+#~ msgid "_Download mail"
+#~ msgstr "Posta _indir"
+
+#~ msgid "Composer"
+#~ msgstr "Yazar"
+
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Sunucudaki tas_lakları kaydet"
+
+#~ msgid "Si_gn emails:"
+#~ msgstr "Epostaları im_zala:"
+
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP Referansı"
+
+#~| msgid "Username:"
+#~ msgid "Username"
+#~ msgstr "Kullanıcı adı"
+
+#~| msgid "_Remember passwords"
+#~ msgid "_Remember password"
+#~ msgstr "Parolayı _hatırla"
+
+#~ msgid "_Authenticate"
+#~ msgstr "_Kimlik Doğrula"
+
+#~ msgid "Reading"
+#~ msgstr "Okunuyor"
+
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Otomatik olarak bir sonraki mesajı seç"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "Konuşma önizleme _görüntüle"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "_İmla denetimini etkinleştir"
+
+#~ msgid "Notifications"
+#~ msgstr "Bildirimler"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "Bildirim seslerini _oynat"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Yeni e-postalar için _bildirimleri göster"
+
+#~ msgid "Notify of new mail at start_up"
+#~ msgstr "Başlangıç_ta yeni posta bildir"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Bu hesabı kaldırmak istediğinizden "
+#~ "emin misiniz?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Bu hesapla ilişkili tüm letiler bilgisayarınızdan kaldırılacak. Bu işlem "
+#~ "sunucudaki iletilerinizi etkilemeyecek."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Takma Ad:"
+#~ msgid "Nickname:"
+#~ msgstr "Takma Ad:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "E-posta adresi:"
+#~ msgid "Email address:"
+#~ msgstr "E-posta adresi:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Geary uygulaması güncellemesi devam ediyor…"
+#~ msgid "Geary update in progress…"
+#~ msgstr "Geary uygulaması güncellemesi devam ediyor…"
 
 #~ msgid "Archive conversation (Delete, Backspace, A)"
 #~ msgstr "Konuşmayı arşivle (Delete, Backspace, A)"
diff --git a/po/uk.po b/po/uk.po
index 2ebe8ae..bf36a75 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -11,416 +11,430 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-30 00:37+0300\n"
-"PO-Revision-Date: 2014-08-30 01:05+0300\n"
-"Last-Translator: Daniel Korostil <ted korostiled gmail com>\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:12+0000\n"
+"Last-Translator: Daniel Korostil <Unknown>\n"
 "Language-Team: linux.org.ua\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:56+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
 "X-Project-Style: gnome\n"
+"Language: uk\n"
 
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "Поштовий клієнт"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Пошта Geary"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "Надіслати та одержати пошту"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Чернетки | Чернетка | Draft | Drafts"
 
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Пошта;Лист;"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
+"Надіслано | Надіслане | Надіслана пошта | Надісланий лист | Sent | Sent Mail "
+"| Sent Email | Sent E-Mail"
 
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "Скласти лист"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+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"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "З_берегти"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Сміття | Смітник | Кошик | TTrash | Rubbish | Rubbish Bin"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Додати"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:19
-msgid "Accounts"
-msgstr "Облікові записи"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Вхідні"
 
-#. Copyright 2011-2014 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "Повне ім'я"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Чернетки"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-msgid "Welcome to Geary."
-msgstr "Ласкаво просимо до Geary."
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Надіслана пошта"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-msgid "Enter your account information to get started."
-msgstr "Введіть інформацію про ваш обліковий запис."
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Із зіркою"
 
-#: ../src/client/accounts/add-edit-page.vala:247
-msgid "2 weeks back"
-msgstr "2 тижні тому"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Важливо"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:248
-msgid "1 month back"
-msgstr "1 місяць тому"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Уся пошта"
 
-#: ../src/client/accounts/add-edit-page.vala:249
-msgid "3 months back"
-msgstr "3 місяці тому"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Спам"
 
-#: ../src/client/accounts/add-edit-page.vala:250
-msgid "6 months back"
-msgstr "6 місяців тому"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Кошик"
 
-#: ../src/client/accounts/add-edit-page.vala:251
-msgid "1 year back"
-msgstr "1 рік тому"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Вихідні"
 
-#: ../src/client/accounts/add-edit-page.vala:252
-msgid "2 years back"
-msgstr "2 роки тому"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Пошук"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "4 years back"
-msgstr "4 роки тому"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Архів"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "Everything"
-msgstr "Загалом"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Немає"
 
-#: ../src/client/accounts/add-edit-page.vala:686
-msgid "Remem_ber passwords"
-msgstr "Запа_м'ятати паролі"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:693 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "Запа_м'ятати пароль"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:727
-msgid "Unable to validate:\n"
-msgstr "Неможливо підтвердити:\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:729
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; Неправильний псевдонім облікового запису.\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:732
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; Електрону адресу вже додано до Geary.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:736
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; Помилка з'єднання IMAP.\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Інше"
 
-#: ../src/client/accounts/add-edit-page.vala:739
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; Неправильний користувач або пароль IMAP.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "долучення"
 
-#: ../src/client/accounts/add-edit-page.vala:742
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; Помилка з'єднання SMTP.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "bcc"
 
-#: ../src/client/accounts/add-edit-page.vala:745
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; Неправильний користувач або пароль SMTP.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "тіло"
 
-#: ../src/client/accounts/add-edit-page.vala:749
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; Помилка з'єднання.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "cc"
 
-#: ../src/client/accounts/add-edit-page.vala:753
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; Неправильний користувач або пароль.\n"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "from"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2014 Yorba Foundation"
-msgstr "© 2011-2014 Yorba Foundation"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "subject"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Відвідати сайт Yorba"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "to"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Запустити Geary зі схованим головним вікном"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "Я"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Виводити зневаджувальну інформацію"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(без теми)"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "Журнал спостереження за розмовами"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %b %-e, %Y at %-l:%M %p"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Журнал мережевої десеріалізації"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "Написано %1$s, %2$s:"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Журнал мережевої діяльності"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s:"
 
-#. / 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 "Журнал черги відповідей IMAP"
+#. / 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:234
+msgid "On %s:"
+msgstr "Написано %s:"
 
-#. / 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 "Журнал мережевої серіалізації"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Пересланий лист ----------"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Журнал періодичної діяльності"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Від: %s\n"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "Журнал запитів баз даних (породжує багато повідомлень)"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "Тема: %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Журнал нормування тек"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Дата: %s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Дозволити ревізію WebView"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "Кому: %s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Відкликати всі серверні сертифікати із зауваженнями щодо TLS"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "Копія: %s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "Показати версію програми"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "немає"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Щоб відкрити нове вікно редактора, введіть %s"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Поштовий клієнт"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
 msgstr ""
-"Будь ласка, надсилайте зауваження, пропозиції та звіти про вади до нас:"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Не вдалося розібрати параметри командної рядка: %s\n"
-
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Невідомий параметр командного рядка «%s»\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Відвідати сайт Yorba"
 
-#: ../src/client/application/geary-controller.vala:56
-msgid "_Delete"
-msgstr "_Вилучити"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Вилучити розмову (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Вилучити розмови (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:62
-msgid "_Trash"
-msgstr "_Смітник"
-
-#: ../src/client/application/geary-controller.vala:63
-msgid "Move conversation to trash (Delete, Backspace)"
-msgstr "Перенести розмову в смітник (Delete, Backspace)"
-
-#: ../src/client/application/geary-controller.vala:64
-msgid "Move conversations to trash (Delete, Backspace)"
-msgstr "Перенести розмови в смітник (Delete, Backspace)"
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr ""
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
 #: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Архівувати"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Архівувати розмову (А)"
 
-#: ../src/client/application/geary-controller.vala:70
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Архівувати розмови (А)"
 
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Зазначити як _спам"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Зазначити не як _спам"
 
-#: ../src/client/application/geary-controller.vala:76
-#: ../src/client/application/geary-controller.vala:295
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "Зазначити розмову"
 
-#: ../src/client/application/geary-controller.vala:77
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Зазначити розмови"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Додати мітку до розмови"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Додати мітку до розмов"
 
-#: ../src/client/application/geary-controller.vala:80
-#: ../src/client/application/geary-controller.vala:334
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "Перенести розмову"
 
-#: ../src/client/application/geary-controller.vala:81
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Перенести розмови"
 
-#: ../src/client/application/geary-controller.vala:271
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "_Облікові записи"
 
-#: ../src/client/application/geary-controller.vala:276
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "П_араметри"
 
-#: ../src/client/application/geary-controller.vala:280
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Довідка"
 
-#: ../src/client/application/geary-controller.vala:284
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Про програму"
 
-#: ../src/client/application/geary-controller.vala:288
-msgid "_Donate"
-msgstr "По_жертвувати"
-
-#: ../src/client/application/geary-controller.vala:292
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "Ви_йти"
 
-#: ../src/client/application/geary-controller.vala:297
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "_Зазначити як…"
 
-#: ../src/client/application/geary-controller.vala:303
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "Зазначити як _прочитане"
 
-#: ../src/client/application/geary-controller.vala:309
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "Зазначити як _непрочитане"
 
-#: ../src/client/application/geary-controller.vala:315
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "_Із зіркою"
 
-#: ../src/client/application/geary-controller.vala:320
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "_Без зірки"
 
-#: ../src/client/application/geary-controller.vala:330
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "Додати мітку"
 
-#: ../src/client/application/geary-controller.vala:331
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "_Мітка"
 
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "_Перенести"
 
-#: ../src/client/application/geary-controller.vala:339
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Скласти новий лист (Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:343
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1579
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "_Відповісти"
 
-#: ../src/client/application/geary-controller.vala:344
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "Відповісти (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:348
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "В_ідповісти всім"
 
-#: ../src/client/application/geary-controller.vala:349
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Відповісти всім (Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:354
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1589
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "_Переслати"
 
-#: ../src/client/application/geary-controller.vala:355
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "Переслати (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:623
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "Неможливо зберегти виняток довіри до сервера"
 
-#: ../src/client/application/geary-controller.vala:860
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "Ваші параметри — незахищені"
 
-#: ../src/client/application/geary-controller.vala:861
+#: ../src/client/application/geary-controller.vala:984
 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 "
@@ -430,17 +444,17 @@ msgstr ""
 "Таким чином ваші пароль та  користувач можуть стати доступними для інших "
 "людей у мережі. Ви впевнені в своєму виборі?"
 
-#: ../src/client/application/geary-controller.vala:862
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "Про_довжити"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:940
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Помилка надсилання пошти"
 
-#: ../src/client/application/geary-controller.vala:941
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -448,14 +462,12 @@ msgstr ""
 "Geary зіткнувся з помилкою надсилання пошти. Якщо проблема не зникає, вручну "
 "вилучіть пошту з теки «Вихідні»."
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:945
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Помилка збереження надісланої пошти"
 
-#: ../src/client/application/geary-controller.vala:946
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -463,20 +475,15 @@ msgstr ""
 "Geary зіткнувся з помилкою збереження надісланої пошти. Лист залишиться в "
 "теці «Вихідні», поки ви його не вилучите."
 
-#: ../src/client/application/geary-controller.vala:1015
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "Мітки"
 
-#. 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:1027
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "Неможливо відкрити базу даних для %s"
 
-#: ../src/client/application/geary-controller.vala:1028
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -500,21 +507,19 @@ msgstr ""
 "Перезбирання бази даних знищить всю локальну пошту та її долучень. <b>На "
 "пошту на вашому сервері це не поширюється.</b>"
 
-#: ../src/client/application/geary-controller.vala:1030
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "_Перебудувати"
 
-#: ../src/client/application/geary-controller.vala:1030
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "В_ийти"
 
-#: ../src/client/application/geary-controller.vala:1039
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Неможливо перезібрати базу даних для «%s»"
 
-#: ../src/client/application/geary-controller.vala:1040
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -524,17 +529,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1062
-#: ../src/client/application/geary-controller.vala:1072
-#: ../src/client/application/geary-controller.vala:1083
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "Неможливо відкрити локальну пошту для %s"
 
-#: ../src/client/application/geary-controller.vala:1063
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -552,7 +553,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1073
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -566,7 +567,7 @@ msgstr ""
 "\n"
 "Встановіть останню версію Geary та спробуйте ще раз."
 
-#: ../src/client/application/geary-controller.vala:1084
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -578,23 +579,29 @@ msgstr ""
 "\n"
 "Перевірте мережевий зв'язок і перезапустіть Geary."
 
-#: ../src/client/application/geary-controller.vala:1591
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "Інформація про %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1594
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
-msgstr "Daniel Korostil <ted korostiled gmail com>"
+msgstr ""
+"Daniel Korostil <ted korostiled gmail com>\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Daniel Korostil https://launchpad.net/~ted-korostiled";
 
-#: ../src/client/application/geary-controller.vala:1858
-#, c-format
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Відкрити «%s»?"
 
-#: ../src/client/application/geary-controller.vala:1859
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -602,438 +609,192 @@ msgstr ""
 "Долучення можуть зашкодити вашій системі. Відкривайте файли лише з надійних "
 "джерел."
 
-#: ../src/client/application/geary-controller.vala:1860
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "Більше не _запитувати"
 
-#: ../src/client/application/geary-controller.vala:1878
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Файл з назвою «%s» вже існує. Перезаписати його?"
 
-#: ../src/client/application/geary-controller.vala:1880
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "У «%s» вже існує такий файл. Його вміст буде переписано при заміні."
 
-#: ../src/client/application/geary-controller.vala:1883
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "_Замінити"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2150
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "Закрити відкриту чернетку листа?"
 
-#: ../src/client/application/geary-controller.vala:2259
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Остаточно вилучити цей лист?"
 msgstr[1] "Остаточно вилучити ці листи?"
 msgstr[2] "Остаточно вилучити ці листи?"
 
-#: ../src/client/application/geary-controller.vala:2261
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "Вилучити"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i збіг"
-msgstr[1] "%i збіги"
-msgstr[2] "%i збігів"
-
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i збіг (обгорнуто)"
-msgstr[1] "%i збіги (обгорнуто)"
-msgstr[2] "%i збігів (обгорнуто)"
-
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "не знайдено"
-
-#: ../src/client/components/main-toolbar.vala:11
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Пошук"
-
-#. Search bar.
-#: ../src/client/components/main-toolbar.vala:78
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Шукати всю пошту в обліковому запису за ключовим словом (Ctrl+S)"
-
-#: ../src/client/components/main-toolbar.vala:212
-#, c-format
-msgid "Indexing %s account"
-msgstr "Індексування облікового запису %s"
-
-#: ../src/client/components/main-toolbar.vala:223
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "Пошук облікового запису %s"
-
-#: ../src/client/components/main-window.vala:323
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "Надсилання…"
-
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "_Гаразд"
-
-#: ../src/client/components/stock.vala:19 ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "_Скасувати"
-
-#: ../src/client/components/stock.vala:23 ../ui/account_list.glade.h:4
-#: ../ui/preferences.glade.h:2
-msgid "_Close"
-msgstr "_Закрити"
-
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "_Відкинути"
-
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "_Відкрити"
-
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "_Надрукувати…"
-
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "В_илучити"
-
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1047
-msgid "Select _All"
-msgstr "Вибрати _все"
-
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "_Зберегти"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:57
-msgid "Saved"
-msgstr "Збережено"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:58
-msgid "Saving"
-msgstr "Зберігання"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:59
-msgid "Error saving"
-msgstr "Помилка зберігання"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Запустити Geary зі схованим головним вікном"
 
-#. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
-#: ../src/client/composer/composer-widget.vala:106
-msgid "attach|enclosed|enclosing|cover letter"
-msgstr "долуч|вклад|файл"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Виводити зневаджувальну інформацію"
 
-#: ../src/client/composer/composer-widget.vala:823
-msgid "Do you want to discard the unsaved message?"
-msgstr "Відкинути незбережений лист?"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Журнал спостереження за розмовами"
 
-#: ../src/client/composer/composer-widget.vala:826
-#: ../src/client/composer/composer-widget.vala:830
-msgid "Do you want to discard this message?"
-msgstr "Відкинути цей лист?"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Журнал мережевої десеріалізації"
 
-#: ../src/client/composer/composer-widget.vala:911
-msgid "Send message with an empty subject and body?"
-msgstr "Надіслати лист без теми і текстом листа?"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Журнал мережевої діяльності"
 
-#: ../src/client/composer/composer-widget.vala:913
-msgid "Send message with an empty subject?"
-msgstr "Надіслати лист без теми?"
+#. / 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 "Журнал черги відповідей IMAP"
 
-#: ../src/client/composer/composer-widget.vala:915
-msgid "Send message with an empty body?"
-msgstr "Надіслати лист без тексту?"
+#. / 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 "Журнал мережевої серіалізації"
 
-#: ../src/client/composer/composer-widget.vala:917
-msgid "Send message without an attachment?"
-msgstr "Надіслати лист без долучень?"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Журнал періодичної діяльності"
 
-#: ../src/client/composer/composer-widget.vala:1100
-msgid "Cannot add attachment"
-msgstr "Неможливо додати долучення"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Журнал запитів баз даних (породжує багато повідомлень)"
 
-#: ../src/client/composer/composer-widget.vala:1111
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "«%s» неможливо знайти."
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Журнал нормування тек"
 
-#: ../src/client/composer/composer-widget.vala:1118
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "«%s» — тека."
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Дозволити ревізію WebView"
 
-#: ../src/client/composer/composer-widget.vala:1125
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "«%s» — порожній файл."
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Відкликати всі серверні сертифікати із зауваженнями щодо TLS"
 
-#: ../src/client/composer/composer-widget.vala:1139
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "«%s» неможливо відкрити, щоб прочитати."
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Показати версію програми"
 
-#: ../src/client/composer/composer-widget.vala:1146
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "«%s» уже долучено для доставлення."
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "Щоб відкрити нове вікно редактора, введіть %s"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1155
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+"Будь ласка, надсилайте зауваження, пропозиції та звіти про вади до нас:"
 
-#: ../src/client/composer/composer-widget.vala:1215
-msgid "To: "
-msgstr "Кому: "
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Не вдалося розібрати параметри командної рядка: %s\n"
 
-#: ../src/client/composer/composer-widget.vala:1218
-msgid "Cc: "
-msgstr "Копія: "
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Невідомий параметр командного рядка «%s»\n"
 
-#: ../src/client/composer/composer-widget.vala:1221
-msgid "Bcc: "
-msgstr "Потайна копія: "
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s — нові листи"
 
-#: ../src/client/composer/composer-widget.vala:1438
-msgid "Select Color"
-msgstr "Вибрати колір"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d новий лист"
+msgstr[1] "%d нових листа"
+msgstr[2] "%d нових листів"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:1884
-msgid "_From:"
-msgstr "_Від:"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d новий лист загалом"
+msgstr[1] "%s, %d нових листа загалом"
+msgstr[2] "%s, %d нових листів загалом"
 
-#. For other types of messages, just show the from account.
-#. Composer label (without mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:1900
-#: ../src/client/conversation-viewer/conversation-viewer.vala:637
-msgid "From:"
-msgstr "Від:"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d інший новий лист для %s)"
+msgstr[1] ""
+"%s\n"
+"(%d інших нових листа для %s)"
+msgstr[2] ""
+"%s\n"
+"(%d інших нових листів для %s)"
 
-#. Copyright 2011-2014 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Window for sending messages.
-#: ../src/client/composer/composer-window.vala:10
-msgid "New Message"
-msgstr "Створити лист"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Відкрити"
 
 #: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Я"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:262
-msgid "No conversations selected."
-msgstr "Жодну розмову не вибрано."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:264
-#, c-format
-msgid "%u conversation selected."
-msgid_plural "%u conversations selected."
-msgstr[0] "%u розмову вибрано."
-msgstr[1] "%u розмови вибрано."
-msgstr[2] "%u розмов вибрано."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:293
-msgid "No search results found."
-msgstr "Не знайдено жодного результату."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:295
-msgid "No conversations in folder."
-msgstr "Немає розмов у теці."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:536
-msgid "This message contains remote images."
-msgstr "Цей лист містить віддалені зображення."
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:536
-msgid "Show Images"
-msgstr "Показати зображення"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:537
-msgid "Always Show From Sender"
-msgstr "Завжди показувати від відправника"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:561
-msgid "Edit Draft"
-msgstr "Редагувати чернетку"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:640
-msgid "To:"
-msgstr "Кому:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:643
-msgid "Cc:"
-msgstr "Копія:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:646
-msgid "Bcc:"
-msgstr "Потайна копія:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:649
-msgid "Subject:"
-msgstr "Тема:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:652
-msgid "Date:"
-msgstr "Дата:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:862
-#, c-format
-msgid "%u read message"
-msgid_plural "%u read messages"
-msgstr[0] "%u прочитаний лист"
-msgstr[1] "%u прочитаних листів"
-msgstr[2] "%u прочитаних листів"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:994
-#, c-format
-msgid "This message was sent successfully, but could not be saved to %s."
-msgstr "Цей лист успішно надіслано, проте його неможливо зберегти в %s."
-
-#. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1020
-#: ../ui/composer.glade.h:4
-msgid "_Copy"
-msgstr "_Копіювати"
-
-#. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1028
-msgid "Copy _Email Address"
-msgstr "Копіювати _поштову адресу"
-
-#. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1033
-#: ../ui/composer.glade.h:17
-msgid "Copy _Link"
-msgstr "Копіювати _посилання"
-
-#. Select message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1041
-msgid "Select _Message"
-msgstr "Вибрати _лист"
-
-#. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1053
-msgid "_Inspect"
-msgstr "_Дослідити"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1279
-msgid "This link appears to go to"
-msgstr "Це посилання начебто веде"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1280
-msgid "but actually goes to"
-msgstr "але насправді веде"
-
-#. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1335
-msgid " (Invalid?)"
-msgstr " (Неправильно?)"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1527
-msgid "_Save As..."
-msgstr "_Зберегти як…"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1532
-msgid "Save All A_ttachments..."
-msgstr "Зберегти всі _долучення…"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1546
-msgid "_Save Image As..."
-msgstr "_Зберегти зображення як…"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1569
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "Зберегти долучення…"
-msgstr[1] "Зберегти долучення…"
-msgstr[2] "Зберегти всі долучення…"
-
-#. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1584
-msgid "Reply to _All"
-msgstr "Відповісти в_сім"
-
-#. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1601
-msgid "_Mark as Read"
-msgstr "_Зазначити як прочитане"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1605
-msgid "_Mark as Unread"
-msgstr "_Зазначити як непрочитане"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1611
-msgid "Mark Unread From _Here"
-msgstr "Зазначити непрочитаним _звідси"
-
-#. Separator.
-#. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1626
-msgid "_View Source"
-msgstr "_Глянути код"
-
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1940
-#: ../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "немає"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2070
-msgid "Failed to open default text editor."
-msgstr "Не вдалося відкрити типовий текстовий редактор."
-
-#: ../src/client/conversation-viewer/conversation-web-view.vala:321
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s — ревізор розмов"
-
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Виберіть файл"
-
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Долучити"
-
 #: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
 msgid "Untrusted Connection: %s"
 msgstr "Ненадійне з'єднання: %s"
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
 msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr "Ототожнення поштового сервера %s у %s:%u неможливо завірити."
 
@@ -1107,93 +868,132 @@ msgstr "Серверний сертифікат уважається небез
 msgid "An error has occurred processing the server's certificate"
 msgstr "Виникла помилка під час оброблення серверного сертифікату"
 
-#. 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 password"
-msgstr "Уведіть ваш пароль"
+msgid "Geary requires your email password to continue"
+msgstr ""
 
-#. 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 лист"
-msgstr[1] "%d листа"
-msgstr[2] "%d листів"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Виберіть файл"
 
-#. / 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 непрочитаний"
-msgstr[1] "%d непрочитаних"
-msgstr[2] "%d непрочитаних"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Долучити"
 
-#. / 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/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr ""
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Вхідні"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Облікові записи"
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d результат"
-msgstr[1] "%d результати"
-msgstr[2] "%d результатів"
+#. / 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 "Повне ім'я"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s — нові листи"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Ласкаво просимо до Geary."
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d новий лист"
-msgstr[1] "%d нових листа"
-msgstr[2] "%d нових листів"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Введіть інформацію про ваш обліковий запис."
 
-#: ../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 новий лист загалом"
-msgstr[1] "%s, %d нових листа загалом"
-msgstr[2] "%s, %d нових листів загалом"
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 тижні тому"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 інший новий лист для %s)"
-msgstr[1] ""
-"%s\n"
-"(%d інших нових листа для %s)"
-msgstr[2] ""
-"%s\n"
-"(%d інших нових листів для %s)"
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 місяць тому"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Відкрити"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 місяці тому"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 місяців тому"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 рік тому"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "2 роки тому"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "4 роки тому"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "Загалом"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "Запа_м'ятати паролі"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "Запа_м'ятати пароль"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Неможливо підтвердити:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Неправильний псевдонім облікового запису.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Електрону адресу вже додано до Geary.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Помилка з'єднання IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Неправильний користувач або пароль IMAP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Помилка з'єднання SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; Неправильний користувач або пароль SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; Помилка з'єднання.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Неправильний користувач або пароль.\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "З_берегти"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Додати"
 
 #. / 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
@@ -1251,7 +1051,6 @@ msgid "Now"
 msgstr "Зараз"
 
 #: ../src/client/util/util-date.vala:167
-#, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
 msgstr[0] "%dхв тому"
@@ -1259,7 +1058,6 @@ msgstr[1] "%dхв тому"
 msgstr[2] "%dхв тому"
 
 #: ../src/client/util/util-date.vala:171
-#, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
 msgstr[0] "%dг тому"
@@ -1273,15 +1071,9 @@ msgstr "Учора"
 #. / 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:30
-#: ../src/engine/rfc822/rfc822-message.vala:741
-msgid "(no subject)"
-msgstr "(без теми)"
-
 #: ../src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "байти"
@@ -1306,678 +1098,757 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "КБ"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d лист"
+msgstr[1] "%d листа"
+msgstr[2] "%d листів"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d непрочитаний"
+msgstr[1] "%d непрочитаних"
+msgstr[2] "%d непрочитаних"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Вхідні"
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "Пошук облікового запису %s"
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Інше"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d результат"
+msgstr[1] "%d результати"
+msgstr[2] "%d результатів"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Вхідні"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "Жодну розмову не вибрано."
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Чернетки"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] "%u розмову вибрано."
+msgstr[1] "%u розмови вибрано."
+msgstr[2] "%u розмов вибрано."
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Надіслана пошта"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
+msgstr "Не знайдено жодного результату."
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Із зіркою"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
+msgstr "Немає розмов у теці."
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Важливо"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
+msgstr "Цей лист містить віддалені зображення."
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Уся пошта"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr "Показати зображення"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Спам"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
+msgstr "Завжди показувати від відправника"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Кошик"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
+msgstr "Редагувати чернетку"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Вихідні"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "Від:"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "Архів"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "Кому:"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:25
-msgid "None"
-msgstr "Немає"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Копія:"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.
-#: ../src/engine/imap-db/imap-db-account.vala:662
-msgid "attachment"
-msgstr "долучення"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Потайна копія:"
 
-#. / Can be typed in the search box like bcc:johndoe example com to find
-#. / messages bcc'd to a particular person.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:665
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "bcc"
-msgstr "bcc"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "Тема:"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:668
-msgid "body"
-msgstr "тіло"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Дата:"
 
-#. / Can be typed in the search box like cc:johndoe example com to find
-#. / messages cc'd to a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:671
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "cc"
-msgstr "cc"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] "%u прочитаний лист"
+msgstr[1] "%u прочитаних листів"
+msgstr[2] "%u прочитаних листів"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.
-#: ../src/engine/imap-db/imap-db-account.vala:674
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "from"
-msgstr "from"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
+msgstr "Цей лист успішно надіслано, проте його неможливо зберегти в %s."
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:677
-msgid "subject"
-msgstr "subject"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "_Копіювати"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:680
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "to"
-msgstr "to"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "Копіювати _поштову адресу"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.
-#: ../src/engine/imap-db/imap-db-account.vala:699
-msgid "me"
-msgstr "Я"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "Копіювати _посилання"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:535
-msgid "Drafts | Draft"
-msgstr "Чернетки | Чернетка | Draft | Drafts"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
+msgstr "Вибрати _лист"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:540
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "Вибрати _все"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "_Дослідити"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr "Це посилання начебто веде"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
+msgstr "але насправді веде"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
+msgstr " (Неправильно?)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
+msgstr "_Зберегти зображення як…"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_Зберегти як…"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "Зберегти всі _долучення…"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] "Зберегти долучення…"
+msgstr[1] "Зберегти долучення…"
+msgstr[2] "Зберегти всі долучення…"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "Відповісти в_сім"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "_Зазначити як прочитане"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "_Зазначити як непрочитане"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
+msgstr "Зазначити непрочитаним _звідси"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "_Глянути код"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "Не вдалося відкрити типовий текстовий редактор."
+
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr "%s — ревізор розмов"
+
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Збережено"
+
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Зберігання"
+
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Помилка зберігання"
+
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
 msgstr ""
-"Надіслано | Надіслане | Надіслана пошта | Надісланий лист | Sent | Sent Mail "
-"| Sent Email | Sent E-Mail"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:545
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Створити лист"
+
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Спам | Непотріб | Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk "
-"Mail | Bulk Email | Bulk E-Mail"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:550
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Сміття | Смітник | Кошик | TTrash | Rubbish | Rubbish Bin"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Відкинути цей лист?"
 
-#. / 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, %b %-e, %Y at %-l:%M %p"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Надіслати лист без теми і текстом листа?"
 
-#. / 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 "Написано %1$s, %2$s:"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Надіслати лист без теми?"
 
-#. / 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:"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Надіслати лист без тексту?"
 
-#. / 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 "Написано %s:"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Надіслати лист без долучень?"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Пересланий лист ----------"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Неможливо додати долучення"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "Від: %s\n"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "«%s» неможливо знайти."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Тема: %s\n"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "«%s» — тека."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "Дата: %s\n"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "«%s» — порожній файл."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "Кому: %s\n"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "«%s» неможливо відкрити, щоб прочитати."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Копія: %s\n"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "«%s» уже долучено для доставлення."
+
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Кому: "
+
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Копія: "
+
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Потайна копія: "
+
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Неможливо вилучити обліковий запис</"
-"span> "
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Вибрати колір"
+
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
 msgstr ""
-"Вікно редактора з цього облікового запису відкрито. Надішліть або відкиньте "
-"лист і спробуйте ще раз."
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "Додати обліковий запис"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_Від:"
+
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Надсилання…"
+
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i збіг"
+msgstr[1] "%i збіги"
+msgstr[2] "%i збігів"
+
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i збіг (обгорнуто)"
+msgstr[1] "%i збіги (обгорнуто)"
+msgstr[2] "%i збігів (обгорнуто)"
+
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "не знайдено"
+
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_Гаразд"
+
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Закрити"
+
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "_Відкинути"
+
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Відкрити"
+
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Надрукувати…"
+
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "В_илучити"
+
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "_Зберегти"
+
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Шукати всю пошту в обліковому запису за ключовим словом (Ctrl+S)"
+
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "Індексування облікового запису %s"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "Редагувати обліковий запис"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "Вилучити обліковий запис"
+#~ msgid "Geary Mail"
+#~ msgstr "Пошта Geary"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "Зачекайте поки перевіряється ваш обліковий запис."
+#~ msgid "Send and receive email"
+#~ msgstr "Надіслати та одержати пошту"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "Надійне з'єднання"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Пошта;Лист;"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "_Завжди довіряти цьому серверу"
+#~ msgid "Compose Message"
+#~ msgstr "Скласти лист"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "_Довіритись цьому серверу"
+#~ msgid "Copyright 2011-2014 Yorba Foundation"
+#~ msgstr "© 2011-2014 Yorba Foundation"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "_Не довіряти цьому серверу"
+#~ msgid "_Delete"
+#~ msgstr "_Вилучити"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_Повернути"
+#~ msgid "_Trash"
+#~ msgstr "_Смітник"
 
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "Пов_торити"
+#~ msgid "Move conversation to trash (Delete, Backspace)"
+#~ msgstr "Перенести розмову в смітник (Delete, Backspace)"
 
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "_Вирізати"
+#~ msgid "Move conversations to trash (Delete, Backspace)"
+#~ msgstr "Перенести розмови в смітник (Delete, Backspace)"
 
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "Вст_авити"
+#~ msgid "_Donate"
+#~ msgstr "По_жертвувати"
 
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "З_ліва"
+#~ msgid "attach|enclosed|enclosing|cover letter"
+#~ msgstr "долуч|вклад|файл"
 
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "С_права"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Відкинути незбережений лист?"
 
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_Центр"
+#~ msgid "Please enter your password"
+#~ msgstr "Уведіть ваш пароль"
 
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "Ви_рівняти"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Неможливо вилучити обліковий "
+#~ "запис</span> "
 
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "Посилання (Ctrl+L)"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Вікно редактора з цього облікового запису відкрито. Надішліть або відкиньте "
+#~ "лист і спробуйте ще раз."
 
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "_Колір"
+#~ msgid "Add account"
+#~ msgstr "Додати обліковий запис"
 
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "Ще параметри"
+#~ msgid "Edit account"
+#~ msgstr "Редагувати обліковий запис"
 
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "Цитувати текст (Ctrl+])"
+#~ msgid "Remove account"
+#~ msgstr "Вилучити обліковий запис"
 
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "Забрати цитування (Ctrl+[)"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Зачекайте поки перевіряється ваш обліковий запис."
 
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Вилучити форматування (Ctrl+Space)"
+#~ msgid "Untrusted Connection"
+#~ msgstr "Надійне з'єднання"
 
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "Вставити _з форматуванням"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "Жирний (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "Курсив (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "Підкреслений (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Перекреслений (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "_Форматований текст"
-
-#: ../ui/composer.glade.h:23
-msgid "Lar_ge"
-msgstr "Ве_ликий"
-
-#: ../ui/composer.glade.h:24
-msgid "Large"
-msgstr "Великий"
-
-#: ../ui/composer.glade.h:25
-msgid "_Medium"
-msgstr "_Середній"
-
-#: ../ui/composer.glade.h:26
-msgid "Medium"
-msgstr "Середній"
-
-#: ../ui/composer.glade.h:27
-msgid "_Small"
-msgstr "_Малий"
-
-#: ../ui/composer.glade.h:28
-msgid "Small"
-msgstr "Малий"
-
-#: ../ui/composer.glade.h:29
-msgid "S_ans Serif"
-msgstr "_Без засічок"
-
-#: ../ui/composer.glade.h:30
-msgid "Sans Serif"
-msgstr "Без засічок"
-
-#: ../ui/composer.glade.h:31
-msgid "S_erif"
-msgstr "_З засічками"
-
-#: ../ui/composer.glade.h:32
-msgid "Serif"
-msgstr "З засічками"
-
-#: ../ui/composer.glade.h:33
-msgid "_Fixed Width"
-msgstr "_Фіксованої ширини"
-
-#: ../ui/composer.glade.h:34
-msgid "Fixed Width"
-msgstr "Фіксована ширина"
-
-#: ../ui/composer.glade.h:35
-msgid "Detach"
-msgstr "Викинути"
-
-#: ../ui/composer.glade.h:36
-msgid "_Send"
-msgstr "_Надіслати"
-
-#: ../ui/composer.glade.h:37
-msgid "Send"
-msgstr "Надіслати"
-
-#: ../ui/composer.glade.h:38
-msgid "_Attach File"
-msgstr "_Долучити файл"
-
-#: ../ui/composer.glade.h:39
-msgid "Attach File"
-msgstr "Долучити файл"
-
-#: ../ui/composer.glade.h:40
-msgid "_Include Original Attachments"
-msgstr "_Вкласти початкові долучення"
-
-#: ../ui/composer.glade.h:41
-msgid "Include Original Attachments"
-msgstr "Вкласти початкові долучення"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:43
-msgid "_To"
-msgstr "_Кому"
-
-#: ../ui/composer.glade.h:44
-msgid "_Cc"
-msgstr "Ко_пія"
-
-#: ../ui/composer.glade.h:45
-msgid "_Subject"
-msgstr "_Тема"
-
-#: ../ui/composer.glade.h:46
-msgid "_Bcc"
-msgstr "По_тайна копія"
-
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:48
-msgid "From"
-msgstr "Від"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "_Завжди довіряти цьому серверу"
 
-#: ../ui/composer.glade.h:49
-msgid "Drop files here"
-msgstr "Перетягніть файли сюди"
+#~ msgid "_Trust This Server"
+#~ msgstr "_Довіритись цьому серверу"
 
-#: ../ui/composer.glade.h:50
-msgid "To add them as attachments"
-msgstr "Щоб додати їх як долучення"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "_Не довіряти цьому серверу"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "Знайти:"
+#~ msgid "_Undo"
+#~ msgstr "_Повернути"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "_Назад"
+#~ msgid "_Redo"
+#~ msgstr "Пов_торити"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "_Далі"
+#~ msgid "Cu_t"
+#~ msgstr "_Вирізати"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "_Враховувати регістр"
+#~ msgid "_Paste"
+#~ msgstr "Вст_авити"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "мітка"
+#~ msgid "_Left"
+#~ msgstr "З_ліва"
 
-#: ../ui/login.glade.h:1
-msgid "Password"
-msgstr "Пароль"
+#~ msgid "_Right"
+#~ msgstr "С_права"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "_Електрона адреса"
+#~ msgid "_Center"
+#~ msgstr "_Центр"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_Пароль"
+#~ msgid "_Justify"
+#~ msgstr "Ви_рівняти"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "_Служба"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "Посилання (Ctrl+L)"
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "_Ім'я"
+#~ msgid "C_olor"
+#~ msgstr "_Колір"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "_Псевдонім"
+#~ msgid "More options"
+#~ msgstr "Ще параметри"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "Робочий, домашній, тощо."
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Цитувати текст (Ctrl+])"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "З_берегти надіслану пошту"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "Забрати цитування (Ctrl+[)"
 
-#: ../ui/login.glade.h:10
-msgid "IMAP settings"
-msgstr "Параметри IMAP"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "Вилучити форматування (Ctrl+Space)"
 
-#: ../ui/login.glade.h:11
-msgid "Se_rver"
-msgstr "Се_рвер"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "Вставити _з форматуванням"
 
-#: ../ui/login.glade.h:12
-msgid "P_ort"
-msgstr "Пор_т"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Жирний (Ctrl+B)"
 
-#: ../ui/login.glade.h:13
-msgid "Ser_ver"
-msgstr "Се_рвер"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Курсив (Ctrl+I)"
 
-#: ../ui/login.glade.h:14
-msgid "Por_t"
-msgstr "Пор_т"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Підкреслений (Ctrl+U)"
 
-#: ../ui/login.glade.h:15
-msgid "SMTP settings"
-msgstr "Параметри SMTP"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Перекреслений (Ctrl+K)"
 
-#: ../ui/login.glade.h:16
-msgid "User_name"
-msgstr "_Користувач"
+#~ msgid "_Rich Text"
+#~ msgstr "_Форматований текст"
 
-#: ../ui/login.glade.h:17
-msgid "Pass_word"
-msgstr "Па_роль"
+#~ msgid "Lar_ge"
+#~ msgstr "Ве_ликий"
 
-#: ../ui/login.glade.h:18
-msgid "SMTP username"
-msgstr "Користувач SMTP"
+#~ msgid "Large"
+#~ msgstr "Великий"
 
-#: ../ui/login.glade.h:19
-msgid "SMTP password"
-msgstr "Пароль SMTP"
+#~ msgid "_Medium"
+#~ msgstr "_Середній"
 
-#: ../ui/login.glade.h:20
-msgid "_Username"
-msgstr "_Користувач"
+#~ msgid "Medium"
+#~ msgstr "Середній"
 
-#: ../ui/login.glade.h:21
-msgid "IMAP username"
-msgstr "Користувач IMAP"
+#~ msgid "_Small"
+#~ msgstr "_Малий"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP password"
-msgstr "Пароль IMAP"
+#~ msgid "Small"
+#~ msgstr "Малий"
 
-#: ../ui/login.glade.h:23
-msgid "Encr_yption"
-msgstr "_Шифрування"
+#~ msgid "S_ans Serif"
+#~ msgstr "_Без засічок"
 
-#: ../ui/login.glade.h:24
-msgid "Encrypt_ion"
-msgstr "_Шифрування"
+#~ msgid "Sans Serif"
+#~ msgstr "Без засічок"
 
-#: ../ui/login.glade.h:26
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "S_erif"
+#~ msgstr "_З засічками"
 
-#: ../ui/login.glade.h:27
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "Serif"
+#~ msgstr "З засічками"
 
-#: ../ui/login.glade.h:28
-msgid "No authentication re_quired"
-msgstr "Не потрібно за_свідчення"
+#~ msgid "_Fixed Width"
+#~ msgstr "_Фіксованої ширини"
 
-#: ../ui/login.glade.h:29
-msgid "Use IMAP cre_dentials"
-msgstr "Використовувати _реєстраційні дані IMAP"
+#~ msgid "Fixed Width"
+#~ msgstr "Фіксована ширина"
 
-#: ../ui/login.glade.h:30
-msgid "Storage"
-msgstr "Пам'ять"
+#~ msgid "Detach"
+#~ msgstr "Викинути"
 
-#: ../ui/login.glade.h:31
-msgid "_Download mail"
-msgstr "_Звантажити пошту"
+#~ msgid "_Send"
+#~ msgstr "_Надіслати"
 
-#: ../ui/login.glade.h:32 ../ui/preferences.glade.h:6
-msgid "Composer"
-msgstr "Редактор"
+#~ msgid "Send"
+#~ msgstr "Надіслати"
 
-#: ../ui/login.glade.h:33
-msgid "Save dra_fts on server"
-msgstr "Зберігати _черевики на сервері"
+#~ msgid "_Attach File"
+#~ msgstr "_Долучити файл"
 
-#: ../ui/login.glade.h:34
-msgid "Si_gn emails:"
-msgstr "_Підписати пошту:"
+#~ msgid "Attach File"
+#~ msgstr "Долучити файл"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "Реєстраційні дані SMTP"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_Вкласти початкові долучення"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username:"
-msgstr "Користувач:"
+#~ msgid "Include Original Attachments"
+#~ msgstr "Вкласти початкові долучення"
 
-#: ../ui/password-dialog.glade.h:3
-msgid "Password:"
-msgstr "Пароль:"
+#~ msgid "_To"
+#~ msgstr "_Кому"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "_Запам'ятати пароль"
+#~ msgid "_Cc"
+#~ msgstr "Ко_пія"
 
-#: ../ui/preferences.glade.h:1
-msgid "Preferences"
-msgstr "Параметри"
+#~ msgid "_Subject"
+#~ msgstr "_Тема"
 
-#: ../ui/preferences.glade.h:3
-msgid "Reading"
-msgstr "Читання"
+#~ msgid "_Bcc"
+#~ msgstr "По_тайна копія"
 
-#: ../ui/preferences.glade.h:4
-msgid "_Automatically select next message"
-msgstr "_Автоматично вибирати наступний лист"
+#~ msgid "From"
+#~ msgstr "Від"
 
-#: ../ui/preferences.glade.h:5
-msgid "_Display conversation preview"
-msgstr "_Показувати попередній огляд розмови"
+#~ msgid "Drop files here"
+#~ msgstr "Перетягніть файли сюди"
 
-#: ../ui/preferences.glade.h:7
-msgid "Enable _spell checking"
-msgstr "Перевіряти _орфографію"
+#~ msgid "To add them as attachments"
+#~ msgstr "Щоб додати їх як долучення"
 
-#: ../ui/preferences.glade.h:8
-msgid "Notifications"
-msgstr "Сповіщення"
+#~ msgid "Find:"
+#~ msgstr "Знайти:"
 
-#: ../ui/preferences.glade.h:9
-msgid "_Play notification sounds"
-msgstr "Про_гравати звукові сповіщення "
+#~ msgid "_Previous"
+#~ msgstr "_Назад"
 
-#: ../ui/preferences.glade.h:10
-msgid "Show _notifications for new mail"
-msgstr "Показувати _сповіщення про нову пошту"
+#~ msgid "_Next"
+#~ msgstr "_Далі"
 
-#: ../ui/preferences.glade.h:11
-msgid "Notify of new mail at start_up"
-msgstr "Сповіщати про нову пошту під час _запуску"
+#~ msgid "_Case sensitive"
+#~ msgstr "_Враховувати регістр"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Вилучити цей обліковий запис?</span> "
+#~ msgid "label"
+#~ msgstr "мітка"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Усю пошту з цього облікового запису буде вилучено локально. Це не ніяк не "
-"вплине на пошту на сервері."
+#~ msgid "Password"
+#~ msgstr "Пароль"
+
+#~ msgid "E_mail address"
+#~ msgstr "_Електрона адреса"
+
+#~ msgid "_Password"
+#~ msgstr "_Пароль"
+
+#~ msgid "S_ervice"
+#~ msgstr "_Служба"
+
+#~ msgid "N_ame"
+#~ msgstr "_Ім'я"
+
+#~ msgid "N_ickname"
+#~ msgstr "_Псевдонім"
+
+#~ msgid "Work, Home, etc."
+#~ msgstr "Робочий, домашній, тощо."
+
+#~ msgid "_Save sent mail"
+#~ msgstr "З_берегти надіслану пошту"
+
+#~ msgid "IMAP settings"
+#~ msgstr "Параметри IMAP"
+
+#~ msgid "Se_rver"
+#~ msgstr "Се_рвер"
+
+#~ msgid "P_ort"
+#~ msgstr "Пор_т"
+
+#~ msgid "Ser_ver"
+#~ msgstr "Се_рвер"
+
+#~ msgid "Por_t"
+#~ msgstr "Пор_т"
+
+#~ msgid "SMTP settings"
+#~ msgstr "Параметри SMTP"
+
+#~ msgid "User_name"
+#~ msgstr "_Користувач"
+
+#~ msgid "Pass_word"
+#~ msgstr "Па_роль"
+
+#~ msgid "SMTP username"
+#~ msgstr "Користувач SMTP"
+
+#~ msgid "SMTP password"
+#~ msgstr "Пароль SMTP"
+
+#~ msgid "_Username"
+#~ msgstr "_Користувач"
+
+#~ msgid "IMAP username"
+#~ msgstr "Користувач IMAP"
+
+#~ msgid "IMAP password"
+#~ msgstr "Пароль IMAP"
+
+#~ msgid "Encr_yption"
+#~ msgstr "_Шифрування"
+
+#~ msgid "Encrypt_ion"
+#~ msgstr "_Шифрування"
+
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
+
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
+
+#~ msgid "No authentication re_quired"
+#~ msgstr "Не потрібно за_свідчення"
+
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Використовувати _реєстраційні дані IMAP"
+
+#~ msgid "Storage"
+#~ msgstr "Пам'ять"
+
+#~ msgid "_Download mail"
+#~ msgstr "_Звантажити пошту"
+
+#~ msgid "Composer"
+#~ msgstr "Редактор"
+
+#~ msgid "Save dra_fts on server"
+#~ msgstr "Зберігати _черевики на сервері"
+
+#~ msgid "Si_gn emails:"
+#~ msgstr "_Підписати пошту:"
+
+#~ msgid "SMTP Credentials"
+#~ msgstr "Реєстраційні дані SMTP"
+
+#~ msgid "Username:"
+#~ msgstr "Користувач:"
+
+#~ msgid "Password:"
+#~ msgstr "Пароль:"
+
+#~ msgid "_Remember password"
+#~ msgstr "_Запам'ятати пароль"
+
+#~ msgid "Preferences"
+#~ msgstr "Параметри"
+
+#~ msgid "Reading"
+#~ msgstr "Читання"
+
+#~ msgid "_Automatically select next message"
+#~ msgstr "_Автоматично вибирати наступний лист"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "_Показувати попередній огляд розмови"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "Перевіряти _орфографію"
+
+#~ msgid "Notifications"
+#~ msgstr "Сповіщення"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "Про_гравати звукові сповіщення"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Показувати _сповіщення про нову пошту"
+
+#~ msgid "Notify of new mail at start_up"
+#~ msgstr "Сповіщати про нову пошту під час _запуску"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Вилучити цей обліковий запис?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr ""
+#~ "Усю пошту з цього облікового запису буде вилучено локально. Це не ніяк не "
+#~ "вплине на пошту на сервері."
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "Псевдонім:"
+#~ msgid "Nickname:"
+#~ msgstr "Псевдонім:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "Електрона адреса:"
+#~ msgid "Email address:"
+#~ msgstr "Електрона адреса:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary upgrade in progress."
-msgstr "Оновлення Geary."
+#~ msgid "Geary upgrade in progress."
+#~ msgstr "Оновлення Geary."
 
 #~ msgid "C_lose"
 #~ msgstr "_Закрити"
diff --git a/po/vi.po b/po/vi.po
index 1dc6a99..16e0222 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -10,1493 +10,1402 @@ 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-20 19:28+0000\n"
-"Last-Translator: yorbajim <jim yorba org>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/projects/p/geary/";
-"language/vi/)\n"
-"Language: vi\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:13+0000\n"
+"Last-Translator: Jim Nelson <jim yorba org>\n"
+"Language-Team: Vietnamese "
+"(http://www.transifex.com/projects/p/geary/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2015-11-23 05:56+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: vi\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:641
-msgid "        &#8226; Connection error.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:624
-msgid "        &#8226; Email address already added to Geary.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:628
-msgid "        &#8226; IMAP connection error.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:631
-msgid "        &#8226; IMAP username or password incorrect.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:621
-msgid "        &#8226; Invalid account nickname.\n"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:634
-msgid "        &#8226; SMTP connection error.\n"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Hộp thư"
 
-#: ../../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Nháp"
 
-#: ../../src/client/accounts/add-edit-page.vala:645
-msgid "        &#8226; Username or password incorrect.\n"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1203
-msgid " (Invalid?)"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:972
-#, c-format
-msgid "\"%s\" already attached for delivery."
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:937
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Tất cả thư"
 
-#: ../../src/client/composer/composer-window.vala:965
-#, c-format
-msgid "\"%s\" could not be opened for reading."
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:944
-#, c-format
-msgid "\"%s\" is a folder."
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:951
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Hộp thư chờ gửi"
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
 msgstr ""
 
-#. / 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"
-
-#. / 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 "%B %-e, %Y %-l:%M %P"
-
-#. / 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 "%B %-e, %Y %-l:%M %P"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr ""
 
-#. / 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"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "Không có gì"
 
-#. / 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, %b %-e, %Y at %-l:%M %p"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr ""
 
-#. / 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 "%b %-e"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr ""
 
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] ""
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d tin nhắn mới"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr ""
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:43
-#, c-format
-msgid "%d results"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
 msgstr ""
 
-#. / 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] ""
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "Khác"
 
-#: ../../src/client/util/util-date.vala:170
-#, c-format
-msgid "%dh ago"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
 msgstr ""
 
-#: ../../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
 msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:222
-#, c-format
-msgid "%i matches"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
 msgstr ""
 
-#: ../../src/client/views/conversation-find-bar.vala:224
-#, c-format
-msgid "%i matches (wrapped)"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
 msgstr ""
 
-#. / 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 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"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:107
-#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr ""
 
-#. / 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)"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
 msgstr ""
 
-#: ../../src/client/views/conversation-web-view.vala:289
-#, c-format
-msgid "%s - Conversation Inspector"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
 msgstr ""
 
-#: ../../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(không có tiêu đề)"
+
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%a, %b %-e, %Y at %-l:%M %p"
+
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
 msgstr ""
 
 #. / 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
+#: ../src/engine/rfc822/rfc822-utils.vala:228
 msgid "%s wrote:"
 msgstr "%s đã viết:"
 
-#: ../../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] ""
+#. / 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:234
+msgid "On %s:"
+msgstr ""
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Thư được chuyển tiếp ----------"
+
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "Từ: %s\n"
+
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:246
-#, c-format
-msgid "%u conversations selected."
-msgstr "%u cuộc đối thoại đã được chọn."
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Ngày: %s\n"
 
-#: ../../src/client/views/conversation-viewer.vala:743
-#, c-format
-msgid "%u read messages"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
 msgstr ""
 
-#. / 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"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr ""
 
-#: ../../src/client/util/util-email.vala:30
-msgid "(no subject)"
-msgstr "(không có tiêu đề)"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Thư được chuyển tiếp ----------"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Mail máy trạm"
 
-#: ../../src/client/accounts/add-edit-page.vala:211
-msgid "1 month back"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:214
-msgid "1 year back"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:210
-msgid "2 weeks back"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:212
-msgid "3 months back"
+#: ../src/client/application/geary-controller.vala:62
+msgid "Delete conversation (Shift+Delete)"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:213
-msgid "6 months back"
+#: ../src/client/application/geary-controller.vala:63
+msgid "Delete conversations (Shift+Delete)"
 msgstr ""
 
-#: ../../ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr ""
 
-#: ../../ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr ""
 
-#: ../../ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/application/geary-controller.vala:72
+msgid "_Archive"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1491
-#, c-format
-msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+#: ../src/client/application/geary-controller.vala:73
+msgid "Archive conversation (A)"
 msgstr ""
-"Một tập tin có tên \"%s\" đã tồn tại. Bạn có muốn thay thế tập tin này?"
 
-#: ../../src/client/geary-controller.vala:245
-msgid "A_ccounts"
+#: ../src/client/application/geary-controller.vala:74
+msgid "Archive conversations (A)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1227
-#, c-format
-msgid "About %s"
-msgstr "Giới thiệu về %s"
+#: ../src/client/application/geary-controller.vala:77
+msgid "Mark as S_pam"
+msgstr ""
 
-#: ../../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
+#: ../src/client/application/geary-controller.vala:78
+msgid "Mark as not S_pam"
 msgstr ""
 
-#: ../../ui/account_list.glade:71
-msgid "Add account"
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
+msgid "Mark conversation"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:304
-msgid "Add label"
+#: ../src/client/application/geary-controller.vala:81
+msgid "Mark conversations"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Tất cả thư"
-
-#: ../../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."
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
+msgid "Move conversation"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:24
-msgid "Allow inspection of WebView"
+#: ../src/client/application/geary-controller.vala:85
+msgid "Move conversations"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:509
-msgid "Always Show From Sender"
+#: ../src/client/application/geary-controller.vala:372
+msgid "A_ccounts"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
+#: ../src/client/application/geary-controller.vala:377
+#: ../src/client/components/stock.vala:27
+msgid "_Preferences"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:48
-msgid "Archive conversation (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/components/stock.vala:25
+msgid "_Help"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:49
-msgid "Archive conversations (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:385
+#: ../src/client/components/stock.vala:21
+msgid "_About"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1477
-#, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr "Bạn có chắc bạn muốn mở \"%s\" không?"
-
-#: ../../src/client/geary-controller.vala:1478
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
+#: ../src/client/application/geary-controller.vala:389
+#: ../src/client/components/stock.vala:29
+msgid "_Quit"
 msgstr ""
-"Các phần đính kèm có thể gây tổn hại đến hệ thống của bạn nếu được mở. Chỉ "
-"mở các tập tin từ những nguồn đáng tin cậy."
 
-#: ../../src/client/views/conversation-viewer.vala:614
-msgid "Bcc:"
-msgstr "Đồng gửi tới"
-
-#: ../../ui/composer.glade:113
-msgid "Bold (Ctrl+B)"
+#: ../src/client/application/geary-controller.vala:394
+msgid "_Mark as..."
 msgstr ""
 
-#: ../../ui/composer.glade:69
-msgid "C_olor"
+#: ../src/client/application/geary-controller.vala:400
+msgid "Mark as _Read"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:926
-msgid "Cannot add attachment"
-msgstr "Không thể thêm vào phần đính kèm"
+#: ../src/client/application/geary-controller.vala:406
+msgid "Mark as _Unread"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:611
-msgid "Cc:"
-msgstr "Đồng gửi:"
+#: ../src/client/application/geary-controller.vala:412
+msgid "_Star"
+msgstr ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
+#: ../src/client/application/geary-controller.vala:417
+msgid "U_nstar"
 msgstr ""
 
-#: ../../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Chọn một tập tin"
+#: ../src/client/application/geary-controller.vala:427
+msgid "Add label"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:553
-msgid "Co_ntinue"
-msgstr "T_iếp tục"
+#: ../src/client/application/geary-controller.vala:428
+msgid "_Label"
+msgstr ""
 
-#: ../../src/client/geary-application.vala:29
-msgid "Compose Message"
-msgstr "Soạn tin nhắn"
+#: ../src/client/application/geary-controller.vala:432
+msgid "_Move"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:313
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr ""
 
-#: ../../ui/preferences.glade:117
-msgid "Composer"
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
+msgid "_Reply"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:897
-msgid "Copy _Email Address"
-msgstr "Sao chép _địa chỉ email"
-
-#: ../../src/client/views/conversation-viewer.vala:902
-msgid "Copy _Link"
-msgstr "Sao chép _đường liên kết"
-
-#: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
+#: ../src/client/application/geary-controller.vala:441
+msgid "Reply (Ctrl+R, R)"
 msgstr ""
 
-#: ../../ui/composer.glade:21
-msgid "Cu_t"
+#: ../src/client/application/geary-controller.vala:445
+msgid "R_eply All"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:620
-msgid "Date:"
-msgstr "Ngày:"
+#: ../src/client/application/geary-controller.vala:446
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+msgstr ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "Ngày: %s\n"
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
+msgid "_Forward"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:43
-msgid "Delete conversation (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:452
+msgid "Forward (Ctrl+L, F)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:44
-msgid "Delete conversations (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:25
-msgid "Display program version"
-msgstr "Hiển thị phiên bản của chương trình"
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:663
-msgid "Do you want to discard the unsaved message?"
-msgstr "Bạn có muốn loại bỏ các tin nhắn chưa được lưu hay không?"
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:666
-msgid "Do you want to discard this message?"
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1479
-msgid "Don't _ask me again"
-msgstr "Không _hỏi tôi lại lần nữa"
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Nháp"
+#: ../src/client/application/geary-controller.vala:746
+msgid "Unable to store server trust exception"
+msgstr ""
 
-#: ../../ui/composer.glade:419
-msgid "Drop files here"
+#: ../src/client/application/geary-controller.vala:983
+msgid "Your settings are insecure"
 msgstr ""
 
-#: ../../ui/login.glade:115
-msgid "E_mail address:"
+#: ../src/client/application/geary-controller.vala:984
+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 ""
 
-#: ../../src/client/geary-controller.vala:704
-msgid "E_xit"
+#: ../src/client/application/geary-controller.vala:985
+msgid "Co_ntinue"
+msgstr "T_iếp tục"
+
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/components/status-bar.vala:29
+msgid "Error sending email"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:533
-msgid "Edit Draft"
+#: ../src/client/application/geary-controller.vala:1064
+msgid ""
+"Geary encountered an error sending an email.  If the problem persists, "
+"please manually delete the email from your Outbox folder."
 msgstr ""
 
-#: ../../ui/account_list.glade:84
-msgid "Edit account"
+#: ../src/client/application/geary-controller.vala:1068
+#: ../src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
 msgstr ""
 
-#: ../../ui/remove_confirm.glade:94
-msgid "Email address:"
+#: ../src/client/application/geary-controller.vala:1069
+msgid ""
+"Geary encountered an error saving a sent message to Sent Mail.  The message "
+"will stay in your Outbox folder until you delete it."
 msgstr ""
 
-#: ../../src/client/geary-application.vala:28
-msgid "Email;E-mail;Mail;"
+#: ../src/client/application/geary-controller.vala:1138
+msgid "Labels"
+msgstr "Nhãn"
+
+#: ../src/client/application/geary-controller.vala:1150
+msgid "Unable to open the database for %s"
 msgstr ""
 
-#: ../../ui/preferences.glade:131
-msgid "Enable _spell checking"
+#: ../src/client/application/geary-controller.vala:1151
+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 ""
 
-#: ../../ui/login.glade:588
-msgid "Encr_yption:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "_Rebuild"
 msgstr ""
 
-#: ../../ui/login.glade:607
-msgid "Encrypt_ion:"
+#: ../src/client/application/geary-controller.vala:1153
+msgid "E_xit"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-msgid "Enter your account information to get started."
-msgstr "Điền vào thông tin tài khoản của bạn để có thể bắt đầu."
+#: ../src/client/application/geary-controller.vala:1162
+msgid "Unable to rebuild database for \"%s\""
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:714
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:43
-msgid "Error saving"
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
+msgid "Unable to open local mailbox for %s"
 msgstr ""
 
-#. / 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"
+#: ../src/client/application/geary-controller.vala:1186
+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 ""
 
-#: ../../src/client/accounts/add-edit-page.vala:216
-msgid "Everything"
+#: ../src/client/application/geary-controller.vala:1196
+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 ""
 
-#: ../../src/client/views/conversation-viewer.vala:1897
-msgid "Failed to open default text editor."
-msgstr "Xảy ra lỗi khi mở trình biên soạn văn bản mặc định."
-
-#: ../../src/client/geary-args.vala:54
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Xảy ra lỗi khi chuyển thông tin từ tùy chọn của dòng lệnh: %s\n"
-
-#. / 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"
+#: ../src/client/application/geary-controller.vala:1207
+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 ""
 
-#: ../../ui/composer.glade:182
-msgid "Fixed Width"
+#: ../src/client/application/geary-controller.vala:1715
+msgid "About %s"
+msgstr "Giới thiệu về %s"
+
+#. / Translators: add your name and email address to receive credit in the About dialog
+#. / For example: Yamada Taro <yamada taro example com>
+#: ../src/client/application/geary-controller.vala:1718
+msgid "translator-credits"
 msgstr ""
+"Launchpad Contributions:\n"
+"  Jim Nelson https://launchpad.net/~yorba-jim";
 
-#: ../../src/client/geary-controller.vala:329
-msgid "Forward (Ctrl+L, F)"
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:605
-msgid "From:"
-msgstr "Từ:"
+#: ../src/client/application/geary-controller.vala:1986
+msgid "Are you sure you want to open \"%s\"?"
+msgstr "Bạn có chắc bạn muốn mở \"%s\" không?"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "Từ: %s\n"
+#: ../src/client/application/geary-controller.vala:1987
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
+"Các phần đính kèm có thể gây tổn hại đến hệ thống của bạn nếu được mở. Chỉ "
+"mở các tập tin từ những nguồn đáng tin cậy."
 
-#: ../../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#: ../src/client/application/geary-controller.vala:1988
+msgid "Don't _ask me again"
+msgstr "Không _hỏi tôi lại lần nữa"
 
-#: ../../src/client/geary-application.vala:25
-msgid "Geary Mail"
-msgstr "Dịch vụ mail Geary"
+#: ../src/client/application/geary-controller.vala:2006
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+"Một tập tin có tên \"%s\" đã tồn tại. Bạn có muốn thay thế tập tin này?"
 
-#: ../../src/client/geary-controller.vala:626
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 
-#: ../../ui/password-dialog.glade:315
-msgid "General"
+#: ../src/client/application/geary-controller.vala:2011
+msgid "_Replace"
 msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/client/application/geary-controller.vala:2309
+msgid "Close open draft messages?"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:133
-msgid "IMAP Credentials"
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
 msgstr ""
 
-#: ../../ui/login.glade:572
-msgid "IMAP password"
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
 msgstr ""
 
-#: ../../ui/login.glade:286 ../../ui/password-dialog.glade:334
-msgid "IMAP settings"
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
 msgstr ""
 
-#: ../../ui/login.glade:556
-msgid "IMAP username"
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Hộp thư"
+#: ../src/client/application/geary-controller.vala:2489
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
+#: ../src/client/application/geary-controller.vala:2491
+msgid "Delete"
 msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:163
-#, c-format
-msgid "Indexing %s account"
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
 msgstr ""
 
-#: ../../ui/composer.glade:120
-msgid "Italic (Ctrl+I)"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
 msgstr ""
 
-#: ../../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
-
-#: ../../src/client/geary-controller.vala:689
-msgid "Labels"
-msgstr "Nhãn"
-
-#: ../../ui/composer.glade:151
-msgid "Lar_ge"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
 msgstr ""
 
-#: ../../ui/composer.glade:152
-msgid "Large"
-msgstr "Lớn"
-
-#: ../../ui/composer.glade:62
-msgid "Link (Ctrl+L)"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
 msgstr ""
 
-#. / 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 "Nhật trình hàng đợi phản hồi IMAP"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Thông tin gỡ rối về dữ liệu nhập vào"
 
-#: ../../src/client/geary-args.vala:11
+#: ../src/client/application/geary-args.vala:12
 msgid "Log conversation monitoring"
 msgstr "Nhật trình giám sát cuộc trò chuyện"
 
-#: ../../src/client/geary-args.vala:21
-msgid "Log database queries (generates lots of messages)"
-msgstr "Nhật trình truy vấn cơ sở dữ liệu (tạo ra nhiều tin nhắn)"
-
-#. / "Normalization" can also be called "synchronization"
-#: ../../src/client/geary-args.vala:23
-msgid "Log folder normalization"
-msgstr "Nhật trình bình thường hóa thư mục"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:13
+#: ../src/client/application/geary-args.vala:14
 msgid "Log network activity"
 msgstr "Nhật trình hoạt động mạng lưới"
 
-#: ../../src/client/geary-args.vala:12
-msgid "Log network deserialization"
-msgstr ""
+#. / 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 "Nhật trình hàng đợi phản hồi IMAP"
 
 #. / Serialization is how commands and responses are converted into a stream of bytes for
 #. / network transmission
-#: ../../src/client/geary-args.vala:19
+#: ../src/client/application/geary-args.vala:20
 msgid "Log network serialization"
 msgstr "Nhật trình số mã mạng lưới"
 
-#: ../../src/client/geary-args.vala:20
+#: ../src/client/application/geary-args.vala:21
 msgid "Log periodic activity"
 msgstr "Nhật trình hoạt động tuần hoàn"
 
-#: ../../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
-
-#: ../../src/client/geary-application.vala:26
-msgid "Mail Client"
-msgstr "Mail máy trạm"
-
-#: ../../src/client/views/conversation-viewer.vala:1479
-msgid "Mark Unread From _Here"
-msgstr ""
-
-#: ../../src/client/geary-controller.vala:52
-msgid "Mark as S_pam"
-msgstr ""
-
-#: ../../src/client/geary-controller.vala:277
-msgid "Mark as _Read"
-msgstr ""
-
-#: ../../src/client/geary-controller.vala:283
-msgid "Mark as _Unread"
-msgstr ""
-
-#: ../../src/client/geary-controller.vala:53
-msgid "Mark as not S_pam"
-msgstr ""
-
-#: ../../src/client/geary-controller.vala:55
-#: ../../src/client/geary-controller.vala:269
-msgid "Mark conversation"
-msgstr ""
-
-#: ../../src/client/geary-controller.vala:56
-msgid "Mark conversations"
-msgstr ""
-
-#: ../../src/client/views/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Tôi"
-
-#: ../../ui/composer.glade:158
-msgid "Medium"
-msgstr "Trung bình"
-
-#: ../../ui/composer.glade:75
-msgid "More options"
-msgstr ""
-
-#: ../../src/client/geary-controller.vala:59
-#: ../../src/client/geary-controller.vala:308
-msgid "Move conversation"
-msgstr ""
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Nhật trình truy vấn cơ sở dữ liệu (tạo ra nhiều tin nhắn)"
 
-#: ../../src/client/geary-controller.vala:60
-msgid "Move conversations"
-msgstr ""
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Nhật trình bình thường hóa thư mục"
 
-#: ../../ui/login.glade:176
-msgid "N_ame:"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
 msgstr ""
 
-#: ../../ui/login.glade:230
-msgid "N_ickname:"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "Tạo mới tin nhắn"
-
-#: ../../ui/remove_confirm.glade:80
-msgid "Nickname:"
-msgstr ""
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "Hiển thị phiên bản của chương trình"
 
-#: ../../ui/login.glade:661
-msgid "No authentication re_quired"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:275
-msgid "No conversations in folder."
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
 msgstr ""
+"Xin vui lòng gửi báo cáo về các tin nhắn, đề nghị và phần gỡ rối về lỗi về:"
 
-#: ../../src/client/views/conversation-viewer.vala:244
-msgid "No conversations selected."
-msgstr "Chưa chọn cuộc đối thoại nào."
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "Xảy ra lỗi khi chuyển thông tin từ tùy chọn của dòng lệnh: %s\n"
 
-#: ../../src/client/views/conversation-viewer.vala:273
-msgid "No search results found."
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:128
-#: ../../src/engine/api/geary-special-folder-type.vala:58
-msgid "None"
-msgstr "Không có gì"
-
-#: ../../ui/preferences.glade:158
-msgid "Notifications"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
 msgstr ""
 
-#: ../../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr ""
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d tin nhắn mới"
 
-#. / 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 ""
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] ""
+msgstr[1] ""
 
-#. / 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 ""
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:160
 msgid "Open"
 msgstr "Mở"
 
-#: ../../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Khác"
-
-#: ../../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Hộp thư chờ gửi"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Tôi"
 
-#: ../../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:10
-msgid "Output debugging information"
-msgstr "Thông tin gỡ rối về dữ liệu nhập vào"
-
-#: ../../ui/login.glade:337
-msgid "P_ort:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr ""
 
-#: ../../ui/login.glade:474
-msgid "Pass_word:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
 msgstr ""
 
-#: ../../ui/login.glade:101
-msgid "Password"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
 msgstr ""
 
-#: ../../ui/password-dialog.glade:196
-msgid "Password:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
 msgstr ""
 
-#: ../../ui/composer.glade:102
-msgid "Paste _With Formatting"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your email password"
-msgstr "Xin vui lòng điền vào mật khẩu email của bạn"
-
-#: ../../src/client/geary-args.vala:47
-msgid "Please report comments, suggestions and bugs to:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
 msgstr ""
-"Xin vui lòng gửi báo cáo về các tin nhắn, đề nghị và phần gỡ rối về lỗi về:"
 
-#: ../../ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
 msgstr ""
 
-#: ../../ui/login.glade:421
-msgid "Por_t:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:367 ../../ui/password-dialog.glade:470
-msgid "Port:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
 msgstr ""
 
-#: ../../ui/composer.glade:81
-msgid "Quote text  (Ctrl+])"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:322
-msgid "R_eply All"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
 msgstr ""
 
-#: ../../ui/preferences.glade:55
-msgid "Reading"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:274
-msgid "Real name:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:590
-msgid "Remem_ber password"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:583
-msgid "Remem_ber passwords"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
 msgstr ""
 
-#: ../../ui/account_list.glade:97
-msgid "Remove account"
-msgstr ""
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Chọn một tập tin"
 
-#: ../../ui/composer.glade:95
-msgid "Remove formatting (Ctrl+Space)"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:318
-msgid "Reply (Ctrl+R, R)"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:323
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1452
-msgid "Reply to _All"
-msgstr "Trả lời _đến tất cả"
-
-#: ../../ui/password-dialog.glade:163
-msgid "SMTP Credentials"
+#. / 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 ""
 
-#: ../../ui/login.glade:507
-msgid "SMTP password"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
 msgstr ""
 
-#: ../../ui/login.glade:439 ../../ui/password-dialog.glade:437
-msgid "SMTP settings"
-msgstr ""
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Điền vào thông tin tài khoản của bạn để có thể bắt đầu."
 
-#: ../../ui/login.glade:491
-msgid "SMTP username"
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:124
-msgid "SSL"
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:382 ../../ui/password-dialog.glade:485
-msgid "SSL/TLS encryption:"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:126
-msgid "STARTTLS"
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
 msgstr ""
 
-#: ../../ui/composer.glade:169
-msgid "S_ans Serif"
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
 msgstr ""
 
-#: ../../ui/composer.glade:175
-msgid "S_erif"
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
 msgstr ""
 
-#: ../../ui/login.glade:160
-msgid "S_ervice:"
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
 msgstr ""
 
-#: ../../ui/composer.glade:170
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: ../../src/client/views/conversation-viewer.vala:1437
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] ""
-
-#: ../../src/client/views/conversation-viewer.vala:1400
-msgid "Save All A_ttachments..."
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:41
-msgid "Saved"
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:42
-msgid "Saving"
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
 msgstr ""
 
-#: ../../ui/login.glade:304
-msgid "Se_rver:"
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
 msgstr ""
 
-#: ../../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"
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
 msgstr ""
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:39
-#: ../../src/client/ui/main-toolbar.vala:170
-#, c-format
-msgid "Search %s account"
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
 msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:76
-msgid "Search all mail in account for keywords (Ctrl+S)"
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:1243
-msgid "Select Color"
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:32
-#: ../../src/client/views/conversation-viewer.vala:916
-msgid "Select _All"
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:910
-msgid "Select _Message"
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:27
-msgid "Send and receive email"
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:747
-msgid "Send message with an empty body?"
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:743
-msgid "Send message with an empty subject and body?"
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:745
-msgid "Send message with an empty subject?"
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:749
-msgid "Send message without an attachment?"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
 msgstr ""
 
-#. / 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..."
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr ""
+#. / 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"
 
-#: ../../ui/login.glade:404
-msgid "Ser_ver:"
-msgstr ""
+#. / 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"
 
-#: ../../ui/composer.glade:176
-msgid "Serif"
-msgstr ""
+#. / 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"
 
-#: ../../ui/password-dialog.glade:352 ../../ui/password-dialog.glade:455
-msgid "Server:"
-msgstr ""
+#. / 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 "%b %-e"
 
-#: ../../ui/password-dialog.glade:259
-msgid "Service:"
-msgstr ""
+#. / 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"
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "Show Images"
-msgstr ""
+#. / 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 "%B %-e, %Y %-l:%M %P"
 
-#: ../../ui/preferences.glade:193
-msgid "Show _notifications for new mail"
-msgstr ""
+#. / 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"
 
-#: ../../ui/composer.glade:164
-msgid "Small"
-msgstr ""
+#. / 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 "%B %-e, %Y %-l:%M %P"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr ""
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:761
-msgid "Storage"
-msgstr ""
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:134
-msgid "Strikethrough (Ctrl+K)"
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:617
-msgid "Subject:"
+#. / 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
+msgid "%A"
 msgstr ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
 msgstr ""
 
-#: ../../src/client/util/util-files.vala:19
+#: ../src/client/util/util-files.vala:19
 msgctxt "Abbreviation for terabyte"
 msgid "TB"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1493
-#, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr ""
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "GB"
 
-#: ../../src/client/geary-controller.vala:747
-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 ""
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "MB"
 
-#: ../../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 ""
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "KB"
 
-#: ../../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 ""
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../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 ""
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/views/conversation-viewer.vala:1147
-msgid "This link appears to go to"
+#. / 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
+msgid "%s, %s"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "This message contains remote images."
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
 msgstr ""
 
-#: ../../ui/composer.glade:435
-msgid "To add them as attachments"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:608
-msgid "To:"
-msgstr ""
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "Chưa chọn cuộc đối thoại nào."
 
-#: ../../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/geary-controller.vala:294
-msgid "U_nstar"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:17
-msgid "Unable to login to email server"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
 msgstr ""
 
-#: ../../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"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:701
-#, c-format
-msgid "Unable to open the database for %s"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:713
-#, c-format
-msgid "Unable to rebuild database for \"%s\""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:619
-msgid "Unable to validate:\n"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
 msgstr ""
 
-#: ../../ui/composer.glade:127
-msgid "Underline (Ctrl+U)"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "Từ:"
 
-#: ../../ui/composer.glade:88
-msgid "Unquote text (Ctrl+[)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:65
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Đồng gửi:"
 
-#: ../../ui/login.glade:457
-msgid "User_name:"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Đồng gửi tới"
 
-#: ../../ui/password-dialog.glade:70 ../../ui/password-dialog.glade:181
-msgid "Username:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:19
-msgid "Visit the Yorba web site"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Ngày:"
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-#, c-format
-msgid "Welcome to Geary."
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/login.glade:252
-msgid "Work, Home, etc."
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
 msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
 msgstr ""
 
-#: ../../src/client/util/util-date.vala:177
-msgid "Yesterday"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "Sao chép _địa chỉ email"
 
-#: ../../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 ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "Sao chép _đường liên kết"
 
-#: ../../src/client/geary-controller.vala:551
-msgid "Your settings are insecure"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:258
-#: ../../src/client/ui/stock.vala:21
-msgid "_About"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
 msgstr ""
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:22
-msgid "_Add"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:47
-msgid "_Archive"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
 msgstr ""
 
-#: ../../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
 msgstr ""
 
-#: ../../ui/composer.glade:525
-msgid "_Attach File"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
 msgstr ""
 
-#: ../../ui/preferences.glade:69
-msgid "_Automatically select next message"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:19
-msgid "_Cancel"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
 msgstr ""
 
-#: ../../ui/composer.glade:52
-msgid "_Center"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:23
-msgid "_Close"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../src/client/views/conversation-viewer.vala:889
-msgid "_Copy"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "Trả lời _đến tất cả"
 
-#: ../../src/client/geary-controller.vala:42
-msgid "_Delete"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:548
-msgid "_Details"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:24
-msgid "_Discard"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
 msgstr ""
 
-#: ../../ui/preferences.glade:90
-msgid "_Display conversation preview"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:262
-msgid "_Donate"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "Xảy ra lỗi khi mở trình biên soạn văn bản mặc định."
 
-#: ../../ui/login.glade:782
-msgid "_Download mail:"
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
 msgstr ""
 
-#: ../../ui/composer.glade:181
-msgid "_Fixed Width"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:328
-#: ../../src/client/views/conversation-viewer.vala:1457
-msgid "_Forward"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:254
-#: ../../src/client/ui/stock.vala:25
-msgid "_Help"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
 msgstr ""
 
-#: ../../ui/composer.glade:542
-msgid "_Include Original Attachments"
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:922
-msgid "_Inspect"
-msgstr ""
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Tạo mới tin nhắn"
 
-#: ../../ui/composer.glade:57
-msgid "_Justify"
+#: ../src/client/composer/composer-widget.vala:138
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:33
-msgid "_Keep"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:305
-msgid "_Label"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
 msgstr ""
 
-#: ../../ui/composer.glade:42
-msgid "_Left"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1469
-msgid "_Mark as Read"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1473
-msgid "_Mark as Unread"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:271
-msgid "_Mark as..."
-msgstr ""
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Không thể thêm vào phần đính kèm"
 
-#: ../../ui/composer.glade:157
-msgid "_Medium"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:309
-msgid "_Move"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:18
-msgid "_OK"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:26
-msgid "_Open"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
 msgstr ""
 
-#: ../../ui/login.glade:131 ../../ui/login.glade:539
-#: ../../ui/password-dialog.glade:85
-msgid "_Password:"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
 msgstr ""
 
-#: ../../ui/composer.glade:35
-msgid "_Paste"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
 msgstr ""
 
-#: ../../ui/preferences.glade:172
-msgid "_Play notification sounds"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:250
-#: ../../src/client/ui/stock.vala:27
-msgid "_Preferences"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:28
-msgid "_Print..."
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:266
-#: ../../src/client/ui/stock.vala:29
-msgid "_Quit"
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:704
-msgid "_Rebuild"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
 msgstr ""
 
-#: ../../ui/composer.glade:14
-msgid "_Redo"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
 msgstr ""
 
-#: ../../ui/password-dialog.glade:561
-msgid "_Remember passwords"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:30
-msgid "_Remove"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:1496
-msgid "_Replace"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:317
-#: ../../src/client/views/conversation-viewer.vala:1447
-msgid "_Reply"
-msgstr ""
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:141
-msgid "_Rich Text"
-msgstr ""
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../ui/composer.glade:47
-msgid "_Right"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
 msgstr ""
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:31
-msgid "_Save"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1395
-msgid "_Save As..."
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1414
-msgid "_Save Image As..."
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
 msgstr ""
 
-#: ../../ui/composer.glade:594
-msgid "_Send"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
 msgstr ""
 
-#: ../../ui/composer.glade:163
-msgid "_Small"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:289
-msgid "_Star"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
 msgstr ""
 
-#: ../../ui/composer.glade:7
-msgid "_Undo"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
 msgstr ""
 
-#: ../../ui/login.glade:522
-msgid "_Username:"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1494
-msgid "_View Source"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
 msgstr ""
 
-#. / 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"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1148
-msgid "but actually goes to"
-msgstr ""
+#~ msgid "%u conversations selected."
+#~ msgstr "%u cuộc đối thoại đã được chọn."
 
-#: ../../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr ""
+#~ msgid "Compose Message"
+#~ msgstr "Soạn tin nhắn"
 
-#. / Placeholder filename for attachments with no filename.
-#: ../../src/client/views/conversation-viewer.vala:1799
-#: ../../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr ""
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Bạn có muốn loại bỏ các tin nhắn chưa được lưu hay không?"
 
-#: ../../src/client/views/conversation-find-bar.vala:226
-msgid "not found"
-msgstr ""
+#~ msgid "Geary Mail"
+#~ msgstr "Dịch vụ mail Geary"
 
-#. / 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 ""
+#~ msgid "Large"
+#~ msgstr "Lớn"
+
+#~ msgid "Medium"
+#~ msgstr "Trung bình"
+
+#~ msgid "Please enter your email password"
+#~ msgstr "Xin vui lòng điền vào mật khẩu email của bạn"
+
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a9749a5..0606457 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,471 +13,486 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-03-30 05:20+0000\n"
-"PO-Revision-Date: 2014-03-30 17:49+0800\n"
-"Last-Translator: Yunqiang Su <wzssyqa gmail com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/geary/";
-"language/zh_CN/)\n"
-"Language: zh_CN\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:13+0000\n"
+"Last-Translator: YunQiang Su <wzssyqa gmail com>\n"
+"Language-Team: Chinese (China) "
+"(http://www.transifex.com/projects/p/geary/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.6.4\n"
-
-#: ../desktop/geary.desktop.in.h:1
-#| msgid "Geary Mail"
-msgid "Geary"
-msgstr "Geary 邮件"
-
-#: ../desktop/geary.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "邮件客户端"
+"X-Launchpad-Export-Date: 2015-11-23 05:56+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: zh_CN\n"
 
-#: ../desktop/geary.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary 邮件"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+#| msgid "Drafts"
+msgid "Drafts | Draft"
+msgstr "Drafts | Draft | 草稿 | 草稿箱"
 
-#: ../desktop/geary.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "发送并接收邮件"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr "Sent | Sent Mail | Sent Email | Sent E-Mail | 发件箱"
 
-#: ../desktop/geary.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Mail;电子邮件;邮件;邮箱;"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+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 | 垃圾邮件 | 垃圾箱"
 
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "撰写邮件"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Trash | Rubbish | Rubbish Bin | 已删除 | 回收站"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "保存(_S)"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "添加(_A)"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "收件箱"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:19
-msgid "Accounts"
-msgstr "帐号"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "草稿"
 
-#. Copyright 2011-2014 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "名 姓"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "已发邮件"
 
-#: ../src/client/accounts/add-edit-page.vala:202
-msgid "Welcome to Geary."
-msgstr "欢迎使用 Geary。"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "已加星标"
 
-#: ../src/client/accounts/add-edit-page.vala:202
-msgid "Enter your account information to get started."
-msgstr "请先输入您的帐号信息。"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "重要邮件"
 
-#: ../src/client/accounts/add-edit-page.vala:223
-msgid "2 weeks back"
-msgstr "2周前"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "全部邮件"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:224
-msgid "1 month back"
-msgstr "1个月前"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "垃圾邮件"
 
-#: ../src/client/accounts/add-edit-page.vala:225
-msgid "3 months back"
-msgstr "3个月前"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "回收站"
 
-#: ../src/client/accounts/add-edit-page.vala:226
-msgid "6 months back"
-msgstr "6个月前"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "已发邮件"
 
-#: ../src/client/accounts/add-edit-page.vala:227
-msgid "1 year back"
-msgstr "1年前"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "搜索"
 
-#: ../src/client/accounts/add-edit-page.vala:228
-#| msgid "1 year back"
-msgid "2 years back"
-msgstr "2 年前"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "归档"
 
-#: ../src/client/accounts/add-edit-page.vala:229
-#| msgid "1 year back"
-msgid "4 years back"
-msgstr "4 年前"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "无"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:231
-msgid "Everything"
-msgstr "所有"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:630
-msgid "Remem_ber passwords"
-msgstr "记住密码(_B)"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:637 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "记住密码(_B)"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:671
-msgid "Unable to validate:\n"
-msgstr "验证失败\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! 邮箱"
 
-#: ../src/client/accounts/add-edit-page.vala:673
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; 昵称包含不合法字符.\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:676
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; 邮件地址已添加到 Geary。\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "其他"
 
-#: ../src/client/accounts/add-edit-page.vala:680
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP 连接错误.\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+#| msgid "Save A_ttachment..."
+#| msgid_plural "Save All A_ttachments..."
+msgid "attachment"
+msgstr "附件"
 
-#: ../src/client/accounts/add-edit-page.vala:683
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; IMAP 用户名或密码错误.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "密送"
 
-#: ../src/client/accounts/add-edit-page.vala:686
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP 连接错误.\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "正文"
 
-#: ../src/client/accounts/add-edit-page.vala:689
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; SMTP 用户名或密码错误.\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+#| msgid "Bcc:"
+msgid "cc"
+msgstr "抄送"
 
-#: ../src/client/accounts/add-edit-page.vala:693
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; 连接错误.\n"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "发件人"
 
-#: ../src/client/accounts/add-edit-page.vala:697
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; 用户名或密码错误.\n"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+#| msgid "Subject:"
+msgid "subject"
+msgstr "主题"
 
-#: ../src/client/application/geary-application.vala:19
-#| msgid "Copyright 2011-2013 Yorba Foundation"
-msgid "Copyright 2011-2014 Yorba Foundation"
-msgstr "版权所有 2011-2014 Yorba Foundation"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "收件人"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "访问 Yorba 网站"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "我"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Output debugging information"
-msgstr "输出调试信息"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(无主题)"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Log conversation monitoring"
-msgstr "记录对话监控"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%Y年%m月%-e,%p %-l:%M"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log network deserialization"
-msgstr "记录网络反序列化"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "在%1$s,%2$s 写道:"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network activity"
-msgstr "记录网络活动"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s 写道:"
 
-#. / 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:16
-msgid "Log IMAP replay queue"
-msgstr "记录 IMAP 重播队列"
+#. / 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:234
+msgid "On %s:"
+msgstr "在%s:"
 
-#. / Serialization is how commands and responses are converted into a stream of bytes for
-#. / network transmission
-#: ../src/client/application/geary-args.vala:19
-msgid "Log network serialization"
-msgstr "记录网络序列"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- 已转发消息 ----------"
 
-#: ../src/client/application/geary-args.vala:20
-msgid "Log periodic activity"
-msgstr "记录周期性活动"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "发件人:%s\n"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log database queries (generates lots of messages)"
-msgstr "记录数据库查询(产生大量信息)"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "主题 : %s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:23
-msgid "Log folder normalization"
-msgstr "记录文件夹标准"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "日期:%s\n"
 
-#: ../src/client/application/geary-args.vala:24
-msgid "Allow inspection of WebView"
-msgstr "允许查看邮件内嵌网页"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "收件人:%s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Display program version"
-msgstr "显示程序版本"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "抄送:%s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:47
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "用 %s 打开新的撰写窗口"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "无"
 
-#: ../src/client/application/geary-args.vala:48
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "请将评论、建议和问题反馈到:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "邮件客户端"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:55
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "无法解析命令行参数:%s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
 
-#: ../src/client/application/geary-args.vala:66
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "无法识别的命令行选项“%s”\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "访问 Yorba 网站"
 
-#: ../src/client/application/geary-controller.vala:46
-msgid "_Delete"
-msgstr "删除(_D)"
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:47
+#: ../src/client/application/geary-controller.vala:62
 #| msgid "Delete conversation (Delete, Backspace, A)"
 msgid "Delete conversation (Shift+Delete)"
 msgstr "删除会话 (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:48
+#: ../src/client/application/geary-controller.vala:63
 #| msgid "Delete conversations (Delete, Backspace, A)"
 msgid "Delete conversations (Shift+Delete)"
 msgstr "删除多个会话 (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:51
-#| msgid "Trash"
-msgid "_Trash"
-msgstr "回收站(_T)"
-
-#: ../src/client/application/geary-controller.vala:52
-#| msgid "Archive conversations (Delete, Backspace, A)"
-msgid "Move conversation to trash (Delete, Backspace)"
-msgstr "将会话移入回收站 (Delete, Backspace)"
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:53
-#| msgid "Archive conversations (Delete, Backspace, A)"
-msgid "Move conversations to trash (Delete, Backspace)"
-msgstr "将多个会话移入回收站 (Delete, Backspace)"
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:56
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "存档(_A)"
 
-#: ../src/client/application/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:73
 #| msgid "Move conversation"
 msgid "Archive conversation (A)"
 msgstr "归档会话 (A)"
 
-#: ../src/client/application/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:74
 #| msgid "Move conversations"
 msgid "Archive conversations (A)"
 msgstr "归档多个会话 (A)"
 
-#: ../src/client/application/geary-controller.vala:61
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "标记为垃圾邮件(_P)"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "取消标记为垃圾邮件(_P)"
 
-#: ../src/client/application/geary-controller.vala:64
-#: ../src/client/application/geary-controller.vala:275
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "增加标签"
 
-#: ../src/client/application/geary-controller.vala:65
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "为"
 
-#: ../src/client/application/geary-controller.vala:66
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "增加标签到会话"
 
-#: ../src/client/application/geary-controller.vala:67
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "增加标签到已选会话"
 
-#: ../src/client/application/geary-controller.vala:68
-#: ../src/client/application/geary-controller.vala:314
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "移动会话"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "移动所选会话"
 
-#: ../src/client/application/geary-controller.vala:251
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "账号"
 
-#: ../src/client/application/geary-controller.vala:256
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: ../src/client/application/geary-controller.vala:260
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../src/client/application/geary-controller.vala:264
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../src/client/application/geary-controller.vala:268
-msgid "_Donate"
-msgstr "捐助(_D)"
-
-#: ../src/client/application/geary-controller.vala:272
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../src/client/application/geary-controller.vala:277
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "标记为(_M)..."
 
-#: ../src/client/application/geary-controller.vala:283
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "标记为已读(_R)"
 
-#: ../src/client/application/geary-controller.vala:289
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "标记为未读(_U)"
 
-#: ../src/client/application/geary-controller.vala:295
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "加注星标(_S)"
 
-#: ../src/client/application/geary-controller.vala:300
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "取消星标(_N)"
 
-#: ../src/client/application/geary-controller.vala:310
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "添加标签"
 
-#: ../src/client/application/geary-controller.vala:311
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "标签(_L)"
 
-#: ../src/client/application/geary-controller.vala:315
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "移动(_M)"
 
-#: ../src/client/application/geary-controller.vala:319
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "撰写新邮件(Ctrl+N, N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:323
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1567
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "回复(_R)"
 
-#: ../src/client/application/geary-controller.vala:324
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "回复(Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:328
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "回复全部(_E)"
 
-#: ../src/client/application/geary-controller.vala:329
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "回复全部(Ctrl+Shift+R, Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:334
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1577
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "转发(_F)"
 
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "转发(Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:618
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:746
+msgid "Unable to store server trust exception"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "您的设置不安全"
 
-#: ../src/client/application/geary-controller.vala:619
+#: ../src/client/application/geary-controller.vala:984
 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 ""
-"您的 IMAP 和/或 SMTP 设置没有指定 SSL 或 TLS。这意味着您的用户名和密码可以被"
-"同一网络中的其他人看到。您确定要这样做吗?"
+"您的 IMAP 和/或 SMTP 设置没有指定 SSL 或 TLS。这意味着您的用户名和密码可以被同一网络中的其他人看到。您确定要这样做吗?"
 
-#: ../src/client/application/geary-controller.vala:620
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "继续(_N)"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:698
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "发送邮件出错"
 
-#: ../src/client/application/geary-controller.vala:699
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
-msgstr ""
-"发送邮件时 Geary 遇到了错误。如果持续出错,请手动从发件箱文件夹中删除该邮件。"
+msgstr "发送邮件时 Geary 遇到了错误。如果持续出错,请手动从发件箱文件夹中删除该邮件。"
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:703
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 #| msgid "Error sending email"
 msgid "Error saving sent mail"
 msgstr "保存已发送邮件出错"
 
-#: ../src/client/application/geary-controller.vala:704
+#: ../src/client/application/geary-controller.vala:1069
 #| msgid ""
 #| "Geary encountered an error sending an email.  If the problem persists, "
 #| "please manually delete the email from your Outbox folder."
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
-msgstr ""
-"将已发送的邮件保存至“已发送”时出错。此封邮件仍然会在发件箱文件夹中,直至被手"
-"动删除。"
+msgstr "将已发送的邮件保存至“已发送”时出错。此封邮件仍然会在发件箱文件夹中,直至被手动删除。"
 
-#: ../src/client/application/geary-controller.vala:773
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "标签"
 
-#. 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:785
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "无法打开 %s 的数据库"
 
-#: ../src/client/application/geary-controller.vala:786
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -489,31 +504,27 @@ msgid ""
 "Rebuilding the database will destroy all local email and its attachments. "
 "<b>The mail on the your server will not be affected.</b>"
 msgstr ""
-"为该账户打开本地邮件数据库时发生错误,这可能是由该目录下的数据文件损坏引起"
-"的:\n"
+"为该账户打开本地邮件数据库时发生错误,这可能是由该目录下的数据文件损坏引起的:\n"
 "\n"
 "%s\n"
 "\n"
 "Geary 可以重建数据库并与服务器重新同步或退出。\n"
 "\n"
-"重建数据库将会删除所有本地邮件及其中包含的附件。 <b>服务器中的邮件不会受到任"
-"何影响。</b>"
+"重建数据库将会删除所有本地邮件及其中包含的附件。 <b>服务器中的邮件不会受到任何影响。</b>"
 
-#: ../src/client/application/geary-controller.vala:788
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "重新构建(_R)"
 
-#: ../src/client/application/geary-controller.vala:788
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "退出(_X)"
 
-#: ../src/client/application/geary-controller.vala:797
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "无法重建 \"%s\" 的数据"
 
-#: ../src/client/application/geary-controller.vala:798
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -523,17 +534,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:820
-#: ../src/client/application/geary-controller.vala:830
-#: ../src/client/application/geary-controller.vala:841
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "无法打开 %s 的本地邮箱"
 
-#: ../src/client/application/geary-controller.vala:821
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -549,7 +556,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:831
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -557,12 +564,11 @@ msgid ""
 "\n"
 "Please install the latest version of Geary and try again."
 msgstr ""
-"此版本的本地邮件数据库已由更新版本的 Geary 格式化。很遗憾,数据文件不能 “回"
-"滚” 以在该版本的 Geary 中正常使用。\n"
+"此版本的本地邮件数据库已由更新版本的 Geary 格式化。很遗憾,数据文件不能 “回滚” 以在该版本的 Geary 中正常使用。\n"
 "\n"
 "请安装最新版本的 Geary 后重试。"
 
-#: ../src/client/application/geary-controller.vala:842
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -572,496 +578,401 @@ msgstr ""
 "读取本地邮件账户时发生错误,这可能是网络连接问题引起的。\n"
 "请检查您的网络连接后重新启动 Geary。"
 
-#: ../src/client/application/geary-controller.vala:1335
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "关于 %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1338
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
 msgstr ""
 "tuhaihe <1132321739qq gmail com>, 2012\n"
-"hepin <hepin sosia us>, 2013"
+"hepin <hepin sosia us>, 2013\n"
+"\n"
+"Launchpad Contributions:\n"
+"  YunQiang Su https://launchpad.net/~wzssyqa";
+
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:1602
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "确定要打开“%s”?"
 
-#: ../src/client/application/geary-controller.vala:1603
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
 msgstr "如果打开,附件可能会对您的系统造成破坏。仅打开可信任来源的文件。"
 
-#: ../src/client/application/geary-controller.vala:1604
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "不再询问(_A)"
 
-#: ../src/client/application/geary-controller.vala:1622
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "名为“%s”的文件已经存在。您要替换它吗?"
 
-#: ../src/client/application/geary-controller.vala:1624
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "“%s”中已有该文件。替换它将覆盖其内容。"
 
-#: ../src/client/application/geary-controller.vala:1627
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "替换(_R)"
 
-#: ../src/client/application/geary-controller.vala:1929
+#: ../src/client/application/geary-controller.vala:2309
+msgid "Close open draft messages?"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2489
 #| 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] "您要永久删除该封邮件吗?"
 
-#: ../src/client/application/geary-controller.vala:1931
+#: ../src/client/application/geary-controller.vala:2491
 #| msgid "_Delete"
 msgid "Delete"
 msgstr "删除"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-#| msgid "%i matches"
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i 个匹配结果"
-
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-#| msgid "%i matches (wrapped)"
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i 个匹配结果(已折叠)"
-
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "未找到"
-
-#: ../src/client/components/main-toolbar.vala:11
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "搜索"
-
-#. Spacer.
-#. Search bar.
-#: ../src/client/components/main-toolbar.vala:84
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "在此帐号的所有邮件中搜索关键字 (Ctrl+S)"
-
-#: ../src/client/components/main-toolbar.vala:205
-#, c-format
-msgid "Indexing %s account"
-msgstr "正在索引 %s 帐号"
-
-#: ../src/client/components/main-toolbar.vala:212
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "搜索帐号 %s"
-
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "正在发送..."
-
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "确定(_O)"
-
-#: ../src/client/components/stock.vala:19 ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: ../src/client/components/stock.vala:23 ../ui/account_list.glade.h:4
-#: ../ui/preferences.glade.h:1
-msgid "_Close"
-msgstr "关闭(_C)"
-
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "舍弃(_D)"
-
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "打开(_O)"
-
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "打印(_P)..."
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "删除(_R)"
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
+msgstr ""
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1035
-msgid "Select _All"
-msgstr "全选(_A)"
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
+msgstr ""
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "保存(_K)"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr ""
 
-#: ../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "新邮件"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "输出调试信息"
 
-#: ../src/client/composer/composer-window.vala:41
-msgid "Saved"
-msgstr "已保存"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "记录对话监控"
 
-#: ../src/client/composer/composer-window.vala:42
-msgid "Saving"
-msgstr "正在保存"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "记录网络反序列化"
 
-#: ../src/client/composer/composer-window.vala:43
-msgid "Error saving"
-msgstr "保存出错"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "记录网络活动"
 
-#. / 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|附件"
+#. / 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 "记录 IMAP 重播队列"
 
-#: ../src/client/composer/composer-window.vala:679
-msgid "Do you want to discard the unsaved message?"
-msgstr "您要舍弃尚未保存的邮件吗?"
+#. / 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 "记录网络序列"
 
-#: ../src/client/composer/composer-window.vala:682
-msgid "Do you want to discard this message?"
-msgstr "您要舍弃该封邮件吗?"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "记录周期性活动"
 
-#: ../src/client/composer/composer-window.vala:759
-msgid "Send message with an empty subject and body?"
-msgstr "确认发送无主题无正文的邮件吗?"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "记录数据库查询(产生大量信息)"
 
-#: ../src/client/composer/composer-window.vala:761
-msgid "Send message with an empty subject?"
-msgstr "确认发送无主题的邮件吗?"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "记录文件夹标准"
 
-#: ../src/client/composer/composer-window.vala:763
-msgid "Send message with an empty body?"
-msgstr "确认发送无正文的邮件吗?"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "允许查看邮件内嵌网页"
 
-#: ../src/client/composer/composer-window.vala:765
-msgid "Send message without an attachment?"
-msgstr "确认发送无附件的邮件吗?"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr ""
 
-#: ../src/client/composer/composer-window.vala:948
-msgid "Cannot add attachment"
-msgstr "无法添加附件"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "显示程序版本"
 
-#: ../src/client/composer/composer-window.vala:959
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "文件 \"%s\" 不存在"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "用 %s 打开新的撰写窗口"
 
-#: ../src/client/composer/composer-window.vala:966
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr " \"%s\" 是一个文件夹."
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "请将评论、建议和问题反馈到:"
 
-#: ../src/client/composer/composer-window.vala:973
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" 是一个空文件."
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "无法解析命令行参数:%s\n"
 
-#: ../src/client/composer/composer-window.vala:987
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "打开文件 \"%s\" 失败"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "无法识别的命令行选项“%s”\n"
 
-#: ../src/client/composer/composer-window.vala:994
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "文件 \"%s\" 已位于附件列表"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s -新邮件"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-window.vala:1003
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d 封新邮件"
 
-#: ../src/client/composer/composer-window.vala:1265
-msgid "Select Color"
-msgstr "选择颜色"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, 共 %d 封新邮件"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-window.vala:1660
-#| msgid "From:"
-msgid "_From:"
-msgstr "发件人(_F):"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(另有 %d 条新邮件给 %s)"
 
-#. For other types of messages, just show the from account.
-#. Composer label (without mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#. Geary account mail will be sent from
-#: ../src/client/composer/composer-window.vala:1676
-#: ../src/client/conversation-viewer/conversation-viewer.vala:628
-#: ../ui/composer.glade.h:41
-msgid "From:"
-msgstr "发件人:"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "打开"
 
 #: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "我"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:255
-msgid "No conversations selected."
-msgstr "未选中对话。"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:257
-#, c-format
-#| msgid "%u conversations selected."
-msgid "%u conversation selected."
-msgid_plural "%u conversations selected."
-msgstr[0] "已选中 %u 个对话。"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:286
-msgid "No search results found."
-msgstr "未找到搜索结果。"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:288
-msgid "No conversations in folder."
-msgstr "文件夹中无对话。"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:527
-msgid "This message contains remote images."
-msgstr "该邮件包含远程图像。"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:527
-msgid "Show Images"
-msgstr "显示图片"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:528
-msgid "Always Show From Sender"
-msgstr "总是显示发件人"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:552
-msgid "Edit Draft"
-msgstr "编辑草稿"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:631
-msgid "To:"
-msgstr "收件人:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:634
-msgid "Cc:"
-msgstr "抄送:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:637
-msgid "Bcc:"
-msgstr "密送:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:640
-msgid "Subject:"
-msgstr "主题:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:643
-msgid "Date:"
-msgstr "日期:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:850
-#, c-format
-#| msgid "%u read messages"
-msgid "%u read message"
-msgid_plural "%u read messages"
-msgstr[0] "%u 封已读邮件"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:982
-#, c-format
-msgid "This message was sent successfully, but could not be saved to %s."
-msgstr "该邮件已成功发送,但无法保存到 %s 中。"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr ""
 
-#. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1008
-#: ../ui/composer.glade.h:4
-msgid "_Copy"
-msgstr "复制(_C)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr ""
 
-#. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1016
-msgid "Copy _Email Address"
-msgstr "复制邮件地址(_E)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr ""
 
-#. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1021
-#: ../ui/composer.glade.h:17
-msgid "Copy _Link"
-msgstr "复制链接(_L)"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr ""
 
-#. Select message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1029
-msgid "Select _Message"
-msgstr "选择消息(_M)"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "选择文件"
 
-#. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1041
-msgid "_Inspect"
-msgstr "检查(_I)"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "附件(_A)"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1267
-msgid "This link appears to go to"
-msgstr "该链接显示将转到"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1268
-msgid "but actually goes to"
-msgstr "但实际却转到"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "帐号"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1323
-msgid " (Invalid?)"
-msgstr "(无效?)"
+#. / 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 "名 姓"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1515
-msgid "_Save As..."
-msgstr "另存为(_S)..."
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "欢迎使用 Geary。"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1520
-msgid "Save All A_ttachments..."
-msgstr "保存全部附件(_T)..."
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "请先输入您的帐号信息。"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1534
-msgid "_Save Image As..."
-msgstr "图像另存为(_S)..."
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2周前"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "保存附件(_T)..."
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1个月前"
 
-#. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1572
-msgid "Reply to _All"
-msgstr "回复全部(_A)"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3个月前"
 
-#. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1589
-msgid "_Mark as Read"
-msgstr "标记为已读(_M)"
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6个月前"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1593
-msgid "_Mark as Unread"
-msgstr "标记为未读(_M)"
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1年前"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1599
-msgid "Mark Unread From _Here"
-msgstr "在此处标记为未读(_H)"
+#: ../src/client/accounts/add-edit-page.vala:258
+#| msgid "1 year back"
+msgid "2 years back"
+msgstr "2 年前"
 
-#. Separator.
-#. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1614
-msgid "_View Source"
-msgstr "查看来源(_V)"
+#: ../src/client/accounts/add-edit-page.vala:259
+#| msgid "1 year back"
+msgid "4 years back"
+msgstr "4 年前"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1908
-#: ../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "无"
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "所有"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2038
-msgid "Failed to open default text editor."
-msgstr "无法打开默认文本编辑器。"
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
 
-#: ../src/client/conversation-viewer/conversation-web-view.vala:296
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "会话检查 %s"
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "选择文件"
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "记住密码(_B)"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "附件(_A)"
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "记住密码(_B)"
 
-#. 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 "Please enter your password"
-msgstr "请输入您的密码"
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "验证失败\n"
 
-#. Label displaying total number of email messages in a folder
-#: ../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] "%d 条消息"
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; 昵称包含不合法字符.\n"
 
-#. / 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 封未读"
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; 邮件地址已添加到 Geary。\n"
 
-#. / 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"
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; IMAP 连接错误.\n"
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "所有收件箱"
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; IMAP 用户名或密码错误.\n"
 
-#: ../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 个结果"
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; SMTP 连接错误.\n"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s -新邮件"
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; SMTP 用户名或密码错误.\n"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d 封新邮件"
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226; 连接错误.\n"
 
-#: ../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 封新邮件"
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; 用户名或密码错误.\n"
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 条新邮件给 %s)"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "保存(_S)"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "打开"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "添加(_A)"
 
 #. / 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
@@ -1119,14 +1030,12 @@ msgid "Now"
 msgstr "现在"
 
 #: ../src/client/util/util-date.vala:167
-#, c-format
 #| msgid "%dm ago"
 msgid "%dm ago"
 msgid_plural "%dm ago"
 msgstr[0] "%d 分钟前"
 
 #: ../src/client/util/util-date.vala:171
-#, c-format
 #| msgid "%dh ago"
 msgid "%dh ago"
 msgid_plural "%dh ago"
@@ -1139,15 +1048,9 @@ msgstr "昨天"
 #. / 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:30
-#: ../src/engine/rfc822/rfc822-message.vala:742
-msgid "(no subject)"
-msgstr "(无主题)"
-
 #: ../src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "字节"
@@ -1172,623 +1075,715 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KB"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d 条消息"
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! 邮箱"
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d 封未读"
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#. / 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
+msgid "%s, %s"
+msgstr "%s,%s"
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "其他"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "所有收件箱"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "收件箱"
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "搜索帐号 %s"
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "草稿"
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+#| msgid "%d results"
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d 个结果"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "已发邮件"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr "未选中对话。"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "已加星标"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+#| msgid "%u conversations selected."
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] "已选中 %u 个对话。"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "重要邮件"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
+msgstr "未找到搜索结果。"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "全部邮件"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
+msgstr "文件夹中无对话。"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "垃圾邮件"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
+msgstr "该邮件包含远程图像。"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "回收站"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr "显示图片"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "已发邮件"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
+msgstr "总是显示发件人"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "归档"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
+msgstr "编辑草稿"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:25
-msgid "None"
-msgstr "无"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "发件人:"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.
-#: ../src/engine/imap-db/imap-db-account.vala:662
-#| msgid "Save A_ttachment..."
-#| msgid_plural "Save All A_ttachments..."
-msgid "attachment"
-msgstr "附件"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "收件人:"
 
-#. / Can be typed in the search box like bcc:johndoe example com to find
-#. / messages bcc'd to a particular person.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:665
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "bcc"
-msgstr "密送"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "抄送:"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:668
-msgid "body"
-msgstr "正文"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "密送:"
 
-#. / Can be typed in the search box like cc:johndoe example com to find
-#. / messages cc'd to a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:671
-#: ../src/engine/imap-db/imap-db-account.vala:684
-#| msgid "Bcc:"
-msgid "cc"
-msgstr "抄送"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "主题:"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.
-#: ../src/engine/imap-db/imap-db-account.vala:674
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "from"
-msgstr "发件人"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "日期:"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.
-#: ../src/engine/imap-db/imap-db-account.vala:677
-#| msgid "Subject:"
-msgid "subject"
-msgstr "主题"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+#| msgid "%u read messages"
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] "%u 封已读邮件"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.
-#: ../src/engine/imap-db/imap-db-account.vala:680
-#: ../src/engine/imap-db/imap-db-account.vala:684
-msgid "to"
-msgstr "收件人"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
+msgstr "该邮件已成功发送,但无法保存到 %s 中。"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.
-#: ../src/engine/imap-db/imap-db-account.vala:699
-msgid "me"
-msgstr "我"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr "复制(_C)"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:521
-#| msgid "Drafts"
-msgid "Drafts | Draft"
-msgstr "Drafts | Draft | 草稿 | 草稿箱"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "复制邮件地址(_E)"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:526
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "Sent | Sent Mail | Sent Email | Sent E-Mail | 发件箱"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr "复制链接(_L)"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:531
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
+msgstr "选择消息(_M)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "全选(_A)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "检查(_I)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr "该链接显示将转到"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
+msgstr "但实际却转到"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
+msgstr " (无效?)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
+msgstr "图像另存为(_S)..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "另存为(_S)..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "保存全部附件(_T)..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] "保存附件(_T)..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "回复全部(_A)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "标记为已读(_M)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "标记为未读(_M)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
+msgstr "在此处标记为未读(_H)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "查看来源(_V)"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "无法打开默认文本编辑器。"
+
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr "会话检查 %s"
+
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "已保存"
+
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "正在保存"
+
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "保存出错"
+
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "新邮件"
+
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail | 垃圾邮件 | 垃圾箱"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:536
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "Trash | Rubbish | Rubbish Bin | 已删除 | 回收站"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "您要舍弃该封邮件吗?"
 
-#. / 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 "%Y年%m月%-e,%p %-l:%M"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "确认发送无主题无正文的邮件吗?"
 
-#. / 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 "在%1$s,%2$s 写道:"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "确认发送无主题的邮件吗?"
 
-#. / 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 写道:"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "确认发送无正文的邮件吗?"
 
-#. / 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 "在%s:"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "确认发送无附件的邮件吗?"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- 已转发消息 ----------"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "无法添加附件"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:215
-#, c-format
-msgid "From: %s\n"
-msgstr "发件人:%s\n"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "文件 \"%s\" 不存在"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr "主题 : %s\n"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" 是一个文件夹."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "日期:%s\n"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" 是一个空文件."
 
-#: ../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "收件人:%s\n"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "打开文件 \"%s\" 失败"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
-msgstr "抄送:%s\n"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "文件 \"%s\" 已位于附件列表"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">移除帐户信息失败</span> "
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr "该帐号当前已有打开的撰写窗口,请先发送或舍弃后重试。"
-
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "添加帐号"
-
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "编辑帐号"
-
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "移除帐号"
-
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "请耐心等待,Geary正在验证您的账户信息"
-
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "撤销(_U)"
-
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "重做(_R)"
-
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "剪切(_C)"
-
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "粘贴(_P)"
-
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "左对齐(_L)"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "右对齐(_R)"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "居中(_C)"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "两端对齐(_J)"
-
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "链接 (Ctrl+L)"
-
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "颜色(_O)"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "选择颜色"
+
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:2364
+#| msgid "From:"
+msgid "_From:"
+msgstr "发件人(_F):"
+
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr ""
+
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "正在发送..."
+
+#: ../src/client/components/conversation-find-bar.vala:214
+#| msgid "%i matches"
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i 个匹配结果"
+
+#: ../src/client/components/conversation-find-bar.vala:216
+#| msgid "%i matches (wrapped)"
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i 个匹配结果(已折叠)"
+
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "未找到"
+
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "确定(_O)"
+
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "取消(_C)"
 
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "更多选项"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "关闭(_C)"
 
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "引用文本(Ctrl+])"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "舍弃(_D)"
 
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "取消引用(Ctrl+[)"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "打开(_O)"
 
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "取消格式(Ctrl+Space)"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "打印(_P)..."
 
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "粘贴并保留格式(_W)"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "删除(_R)"
 
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "加粗(Ctrl+B)"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "保存(_K)"
 
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "斜体(Ctrl+I)"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "在此帐号的所有邮件中搜索关键字 (Ctrl+S)"
 
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "下划线(Ctrl+U)"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "正在索引 %s 帐号"
 
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "删除线(Ctrl+K)"
+#~| msgid "Geary Mail"
+#~ msgid "Geary"
+#~ msgstr "Geary 邮件"
 
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "富文本(_R)"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary 邮件"
 
-#: ../ui/composer.glade.h:23
-msgid "Lar_ge"
-msgstr "大号字体(_G)"
+#~ msgid "Send and receive email"
+#~ msgstr "发送并接收邮件"
 
-#: ../ui/composer.glade.h:24
-msgid "Large"
-msgstr "大"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Email;E-mail;Mail;电子邮件;邮件;邮箱;"
 
-#: ../ui/composer.glade.h:25
-msgid "_Medium"
-msgstr "中等字体(_M)"
+#~ msgid "Compose Message"
+#~ msgstr "撰写邮件"
 
-#: ../ui/composer.glade.h:26
-msgid "Medium"
-msgstr "中等"
+#~| msgid "Copyright 2011-2013 Yorba Foundation"
+#~ msgid "Copyright 2011-2014 Yorba Foundation"
+#~ msgstr "版权所有 2011-2014 Yorba Foundation"
 
-#: ../ui/composer.glade.h:27
-msgid "_Small"
-msgstr "小号字体(_S)"
+#~ msgid "_Delete"
+#~ msgstr "删除(_D)"
 
-#: ../ui/composer.glade.h:28
-msgid "Small"
-msgstr "小"
+#~| msgid "Trash"
+#~ msgid "_Trash"
+#~ msgstr "回收站(_T)"
 
-#: ../ui/composer.glade.h:29
-msgid "S_ans Serif"
-msgstr "无衬线字体(_A)"
+#~| msgid "Archive conversations (Delete, Backspace, A)"
+#~ msgid "Move conversation to trash (Delete, Backspace)"
+#~ msgstr "将会话移入回收站 (Delete, Backspace)"
 
-#: ../ui/composer.glade.h:30
-msgid "Sans Serif"
-msgstr "Sans Serif"
+#~| msgid "Archive conversations (Delete, Backspace, A)"
+#~ msgid "Move conversations to trash (Delete, Backspace)"
+#~ msgstr "将多个会话移入回收站 (Delete, Backspace)"
 
-#: ../ui/composer.glade.h:31
-msgid "S_erif"
-msgstr "衬线字体(_E)"
+#~ msgid "_Donate"
+#~ msgstr "捐助(_D)"
 
-#: ../ui/composer.glade.h:32
-msgid "Serif"
-msgstr "Serif"
+#~ msgid "attach|enclosed|enclosing|cover letter"
+#~ msgstr "attach|enclosed|enclosing|cover letter|附件"
 
-#: ../ui/composer.glade.h:33
-msgid "_Fixed Width"
-msgstr "等宽字体(_F)"
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "您要舍弃尚未保存的邮件吗?"
 
-#: ../ui/composer.glade.h:34
-msgid "Fixed Width"
-msgstr "等宽字体"
+#~| msgid "Please enter your email password"
+#~ msgid "Please enter your password"
+#~ msgstr "请输入您的密码"
 
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:36
-msgid "_To:"
-msgstr "收件人(_T)"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr "<span weight=\"bold\" size=\"larger\">移除帐户信息失败</span> "
 
-#: ../ui/composer.glade.h:37
-msgid "_Cc:"
-msgstr "抄送(_C)"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr "该帐号当前已有打开的撰写窗口,请先发送或舍弃后重试。"
 
-#: ../ui/composer.glade.h:38
-#| msgid "Subject:"
-msgid "_Subject:"
-msgstr "主题(_S):"
+#~ msgid "Add account"
+#~ msgstr "添加帐号"
 
-#: ../ui/composer.glade.h:39
-#| msgid "Bcc:"
-msgid "_Bcc:"
-msgstr "密送(_B):"
+#~ msgid "Edit account"
+#~ msgstr "编辑帐号"
 
-#: ../ui/composer.glade.h:42
-msgid "Drop files here"
-msgstr "将文件拖放到此处"
+#~ msgid "Remove account"
+#~ msgstr "移除帐号"
 
-#: ../ui/composer.glade.h:43
-msgid "To add them as attachments"
-msgstr "将他们添加为附件"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "请耐心等待,Geary正在验证您的账户信息"
 
-#: ../ui/composer.glade.h:44
-msgid "_Attach File"
-msgstr "附件"
+#~ msgid "_Undo"
+#~ msgstr "撤销(_U)"
 
-#: ../ui/composer.glade.h:45
-msgid "_Include Original Attachments"
-msgstr "包括原始附件(_I)"
+#~ msgid "_Redo"
+#~ msgstr "重做(_R)"
 
-#: ../ui/composer.glade.h:46
-msgid "C_lose"
-msgstr "关闭(_C)"
+#~ msgid "Cu_t"
+#~ msgstr "剪切(_C)"
 
-#: ../ui/composer.glade.h:47
-msgid "_Send"
-msgstr "发送(_S)"
+#~ msgid "_Paste"
+#~ msgstr "粘贴(_P)"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "查找:"
+#~ msgid "_Left"
+#~ msgstr "左对齐(_L)"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "上一个(_P)"
+#~ msgid "_Right"
+#~ msgstr "右对齐(_R)"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "下一个(_N)"
+#~ msgid "_Center"
+#~ msgstr "居中(_C)"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "区分大小写(_C)"
+#~ msgid "_Justify"
+#~ msgstr "两端对齐(_J)"
 
-#: ../ui/find_bar.glade.h:5
-#| msgid "Labels"
-msgid "label"
-msgstr "标签"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "链接 (Ctrl+L)"
 
-#: ../ui/login.glade.h:1
-msgid "Password"
-msgstr "密码"
+#~ msgid "C_olor"
+#~ msgstr "颜色(_O)"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address:"
-msgstr "邮件地址(_M):"
+#~ msgid "More options"
+#~ msgstr "更多选项"
 
-#: ../ui/login.glade.h:3
-msgid "_Password:"
-msgstr "密码(_P):"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "引用文本(Ctrl+])"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice:"
-msgstr "服务(_E):"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "取消引用(Ctrl+[)"
 
-#: ../ui/login.glade.h:5
-msgid "N_ame:"
-msgstr "名称(_A):"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "取消格式(Ctrl+Space)"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname:"
-msgstr "昵称(_I):"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "粘贴并保留格式(_W)"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "工作, 家庭, 等。"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "加粗(Ctrl+B)"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "保存已发邮件(_S)"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "斜体(Ctrl+I)"
 
-#: ../ui/login.glade.h:10
-msgid "IMAP settings"
-msgstr "IMAP 设置"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "下划线(Ctrl+U)"
 
-#: ../ui/login.glade.h:11
-msgid "Se_rver:"
-msgstr "服务器(_R):"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "删除线(Ctrl+K)"
 
-#: ../ui/login.glade.h:12
-msgid "P_ort:"
-msgstr "端口(_O):"
+#~ msgid "_Rich Text"
+#~ msgstr "富文本(_R)"
 
-#: ../ui/login.glade.h:13
-msgid "Ser_ver:"
-msgstr "服务器(_V):"
+#~ msgid "Lar_ge"
+#~ msgstr "大号字体(_G)"
 
-#: ../ui/login.glade.h:14
-msgid "Por_t:"
-msgstr "端口(_T):"
+#~ msgid "Large"
+#~ msgstr "大"
 
-#: ../ui/login.glade.h:15
-msgid "SMTP settings"
-msgstr "SMTP 设置"
+#~ msgid "_Medium"
+#~ msgstr "中等字体(_M)"
 
-#: ../ui/login.glade.h:16
-msgid "User_name:"
-msgstr "用户名(_N):"
+#~ msgid "Medium"
+#~ msgstr "中等"
 
-#: ../ui/login.glade.h:17
-msgid "Pass_word:"
-msgstr "密码(_W):"
+#~ msgid "_Small"
+#~ msgstr "小号字体(_S)"
 
-#: ../ui/login.glade.h:18
-msgid "SMTP username"
-msgstr "SMTP 用户名"
+#~ msgid "Small"
+#~ msgstr "小"
 
-#: ../ui/login.glade.h:19
-msgid "SMTP password"
-msgstr "SMTP 密码"
+#~ msgid "S_ans Serif"
+#~ msgstr "无衬线字体(_A)"
 
-#: ../ui/login.glade.h:20
-msgid "_Username:"
-msgstr "用户名(_U):"
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Serif"
 
-#: ../ui/login.glade.h:21
-msgid "IMAP username"
-msgstr "IMAP 用户名"
+#~ msgid "S_erif"
+#~ msgstr "衬线字体(_E)"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP password"
-msgstr "IMAP 密码"
+#~ msgid "Serif"
+#~ msgstr "Serif"
 
-#: ../ui/login.glade.h:23
-msgid "Encr_yption:"
-msgstr "加密(_Y):"
+#~ msgid "_Fixed Width"
+#~ msgstr "等宽字体(_F)"
 
-#: ../ui/login.glade.h:24
-msgid "Encrypt_ion:"
-msgstr "加密(_I):"
+#~ msgid "Fixed Width"
+#~ msgstr "等宽字体"
 
-#: ../ui/login.glade.h:26
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "_To:"
+#~ msgstr "收件人(_T)"
 
-#: ../ui/login.glade.h:27
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "_Cc:"
+#~ msgstr "抄送(_C)"
 
-#: ../ui/login.glade.h:28
-msgid "No authentication re_quired"
-msgstr "不需要认证信息"
+#~| msgid "Subject:"
+#~ msgid "_Subject:"
+#~ msgstr "主题(_S):"
 
-#: ../ui/login.glade.h:29
-#| msgid "IMAP Credentials"
-msgid "Use IMAP cre_dentials"
-msgstr "使用 IMAP 证书"
+#~| msgid "Bcc:"
+#~ msgid "_Bcc:"
+#~ msgstr "密送(_B):"
 
-#: ../ui/login.glade.h:30
-msgid "Storage"
-msgstr "本地缓存"
+#~ msgid "Drop files here"
+#~ msgstr "将文件拖放到此处"
 
-#: ../ui/login.glade.h:31
-msgid "_Download mail:"
-msgstr "下载邮件(_D)"
+#~ msgid "To add them as attachments"
+#~ msgstr "将他们添加为附件"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "SMTP 证书"
+#~ msgid "_Attach File"
+#~ msgstr "附件"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username:"
-msgstr "用户名:"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "包括原始附件(_I)"
 
-#: ../ui/password-dialog.glade.h:3
-msgid "Password:"
-msgstr "密码:"
+#~ msgid "C_lose"
+#~ msgstr "关闭(_C)"
 
-#: ../ui/password-dialog.glade.h:4
-#| msgid "_Remember passwords"
-msgid "_Remember password"
-msgstr "记住密码(_R)"
+#~ msgid "_Send"
+#~ msgstr "发送(_S)"
 
-#: ../ui/preferences.glade.h:2
-msgid "Reading"
-msgstr "阅读"
+#~ msgid "Find:"
+#~ msgstr "查找:"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Automatically select next message"
-msgstr "自动选择下一条信息(_A)"
+#~ msgid "_Previous"
+#~ msgstr "上一个(_P)"
 
-#: ../ui/preferences.glade.h:4
-msgid "_Display conversation preview"
-msgstr "显示对话预览(_D)"
+#~ msgid "_Next"
+#~ msgstr "下一个(_N)"
 
-#: ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "邮件撰写"
+#~ msgid "_Case sensitive"
+#~ msgstr "区分大小写(_C)"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "启用拼写检查(_S)"
+#~| msgid "Labels"
+#~ msgid "label"
+#~ msgstr "标签"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "通知"
+#~ msgid "Password"
+#~ msgstr "密码"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "播放通知声音(_P)"
+#~ msgid "E_mail address:"
+#~ msgstr "邮件地址(_M):"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "显示新邮件通知(_N)"
+#~ msgid "_Password:"
+#~ msgstr "密码(_P):"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">您确认要移除该邮件账号信息?</span>"
+#~ msgid "S_ervice:"
+#~ msgstr "服务(_E):"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr "该地址相关的所有邮件都将从本地删除,但不影响您远程服务器上的邮件"
+#~ msgid "N_ame:"
+#~ msgstr "名称(_A):"
+
+#~ msgid "N_ickname:"
+#~ msgstr "昵称(_I):"
+
+#~ msgid "Work, Home, etc."
+#~ msgstr "工作, 家庭, 等。"
+
+#~ msgid "_Save sent mail"
+#~ msgstr "保存已发邮件(_S)"
+
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP 设置"
+
+#~ msgid "Se_rver:"
+#~ msgstr "服务器(_R):"
+
+#~ msgid "P_ort:"
+#~ msgstr "端口(_O):"
+
+#~ msgid "Ser_ver:"
+#~ msgstr "服务器(_V):"
+
+#~ msgid "Por_t:"
+#~ msgstr "端口(_T):"
+
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP 设置"
+
+#~ msgid "User_name:"
+#~ msgstr "用户名(_N):"
+
+#~ msgid "Pass_word:"
+#~ msgstr "密码(_W):"
+
+#~ msgid "SMTP username"
+#~ msgstr "SMTP 用户名"
+
+#~ msgid "SMTP password"
+#~ msgstr "SMTP 密码"
+
+#~ msgid "_Username:"
+#~ msgstr "用户名(_U):"
+
+#~ msgid "IMAP username"
+#~ msgstr "IMAP 用户名"
+
+#~ msgid "IMAP password"
+#~ msgstr "IMAP 密码"
+
+#~ msgid "Encr_yption:"
+#~ msgstr "加密(_Y):"
+
+#~ msgid "Encrypt_ion:"
+#~ msgstr "加密(_I):"
+
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
+
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
+
+#~ msgid "No authentication re_quired"
+#~ msgstr "不需要认证信息"
+
+#~| msgid "IMAP Credentials"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "使用 IMAP 证书"
+
+#~ msgid "Storage"
+#~ msgstr "本地缓存"
+
+#~ msgid "_Download mail:"
+#~ msgstr "下载邮件(_D)"
+
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP 证书"
+
+#~ msgid "Username:"
+#~ msgstr "用户名:"
+
+#~ msgid "Password:"
+#~ msgstr "密码:"
+
+#~| msgid "_Remember passwords"
+#~ msgid "_Remember password"
+#~ msgstr "记住密码(_R)"
+
+#~ msgid "Reading"
+#~ msgstr "阅读"
+
+#~ msgid "_Automatically select next message"
+#~ msgstr "自动选择下一条信息(_A)"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "显示对话预览(_D)"
+
+#~ msgid "Composer"
+#~ msgstr "邮件撰写"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "启用拼写检查(_S)"
+
+#~ msgid "Notifications"
+#~ msgstr "通知"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "播放通知声音(_P)"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "显示新邮件通知(_N)"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr "<span weight=\"bold\" size=\"larger\">您确认要移除该邮件账号信息?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr "该地址相关的所有邮件都将从本地删除,但不影响您远程服务器上的邮件"
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "昵称:"
+#~ msgid "Nickname:"
+#~ msgstr "昵称:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "邮件地址:"
+#~ msgid "Email address:"
+#~ msgstr "邮件地址:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary upgrade in progress."
-msgstr "Geary 正在升级。"
+#~ msgid "Geary upgrade in progress."
+#~ msgstr "Geary 正在升级。"
 
 #~ msgid "Archive conversation (Delete, Backspace, A)"
 #~ msgstr "存档会话 (Delete, Backspace, A)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8e18e86..3a847bb 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,510 +8,474 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=geary&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-03-23 05:58+0000\n"
-"PO-Revision-Date: 2015-03-23 22:35+0800\n"
+"Report-Msgid-Bugs-To: "
+"http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
+"onent=general\n"
+"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"PO-Revision-Date: 2015-11-23 01:13+0000\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/geary/";
-"language/zh_TW/)\n"
-"Language: zh_TW\n"
+"Language-Team: Chinese (Taiwan) "
+"(http://www.transifex.com/projects/p/geary/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.7.1\n"
-
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "郵件客戶端"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary 郵件"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "寄送與收受郵件"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Mail;電子郵件;電郵;郵件;信件;收信;寄信;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "編撰訊息"
-
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "透過電子郵件寄送"
-
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "使用 Geary 傳送檔案"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "儲存(_S)"
+"X-Launchpad-Export-Date: 2015-11-23 05:56+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+"Language: zh_TW\n"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "加入(_A)"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "草稿 | Drafts | Draft"
 
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "%s 的其他位址"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
+"已寄送 | 已送出 | 已寄送郵件 | 已寄送電子郵件 | Sent | Sent Mail | Sent Email | Sent E-Mail"
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "帳號"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+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"
 
-#. Copyright 2011-2015 Yorba Foundation
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / 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 "名字 姓氏"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "垃圾桶 | 垃圾筒 | 回收筒 | 垃圾 | Trash | Rubbish | Rubbish Bin"
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Welcome to Geary."
-msgstr "歡迎使用 Geary。"
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:233
-msgid "Enter your account information to get started."
-msgstr "請輸入您的帳戶資訊以開始使用。"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "收信匣"
 
-#: ../src/client/accounts/add-edit-page.vala:253
-msgid "2 weeks back"
-msgstr "2 週前"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "草稿"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:254
-msgid "1 month back"
-msgstr "1 個月前"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "已寄郵件"
 
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "3 months back"
-msgstr "3 週前"
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "已標星"
 
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "6 months back"
-msgstr "6 週前"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "重要"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "1 year back"
-msgstr "1 年前"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "所有郵件"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-msgid "2 years back"
-msgstr "2 年前"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "垃圾郵件"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-msgid "4 years back"
-msgstr "4 年前"
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "垃圾桶"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "Everything"
-msgstr "每件"
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "寄件匣"
 
-#: ../src/client/accounts/add-edit-page.vala:280
-msgid "Edit"
-msgstr "編輯"
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "搜尋"
 
-#: ../src/client/accounts/add-edit-page.vala:282
-msgid "Preview"
-msgstr "預覽"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "封存"
 
-#: ../src/client/accounts/add-edit-page.vala:723
-msgid "Remem_ber passwords"
-msgstr "記住密碼(_B)"
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "無"
 
-#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "記住密碼(_B)"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
 
-#: ../src/client/accounts/add-edit-page.vala:764
-msgid "Unable to validate:\n"
-msgstr "無法成功驗證:\n"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
 
-#: ../src/client/accounts/add-edit-page.vala:766
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; 帳號暱稱無效。\n"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:769
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; 電子郵件位址已加入 Geary。\n"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../src/client/accounts/add-edit-page.vala:773
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP 連線錯誤。\n"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:776
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; IMAP 使用者名稱或密碼不正確。\n"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "其他"
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP 連線錯誤。\n"
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr "附件"
 
-#: ../src/client/accounts/add-edit-page.vala:782
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; SMTP  使用者名稱或密碼不正確。\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "密件副本"
 
-#: ../src/client/accounts/add-edit-page.vala:786
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226;連線錯誤 。\n"
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "正文"
 
-#: ../src/client/accounts/add-edit-page.vala:790
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; 使用者名稱或密碼不正確。\n"
+#. / 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 match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "副本"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "著作權所有 2011-2015 Yorba Foundation"
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "寄件者"
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "造訪 Yorba 網站"
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "主旨"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "啟動 Geary 並隱藏主視窗"
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "收件者"
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "輸出除錯用資訊"
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "我"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "紀錄對話監視"
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr "(無主旨)"
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "紀錄網路去序列化"
+#. / 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:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%Y年%b%-e日 %a %p %-l:%M"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "紀錄網路活動"
+#. / 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:221
+msgid "On %1$s, %2$s wrote:"
+msgstr "%2$s 於 %1$s 寫下:"
 
-#. / 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 "紀錄 IMAP replay 佇列"
+#. / 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:228
+msgid "%s wrote:"
+msgstr "%s 寫到:"
 
-#. / 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 "紀錄網路序列化"
+#. / 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:234
+msgid "On %s:"
+msgstr "於 %s:"
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "紀錄週期性活動"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- 轉寄的訊息 ----------"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "紀錄資料庫查詢 (會產生大量訊息)"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr "寄件者:%s\n"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "紀錄資料夾一般化"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr "主旨:%s\n"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "允許 WebView 的檢閱"
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "日期:%s\n"
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "撤銷所有具 TLS 警告的伺服器憑證"
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr "收件者:%s\n"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "顯示程式版本"
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr "副本:%s\n"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "使用 %s 開啟新的編撰器視窗"
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr "無"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "請回報評註、建議與臭蟲至:"
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "郵件客戶端"
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "無法解析指令列選項:%s\n"
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "著作權所有 2011-2015 Yorba Foundation"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "無法辨識的指令列選項「%s」\n"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "造訪 Yorba 網站"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:61
 msgid "Delete conversation"
 msgstr "刪除對話"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "刪除對話 (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "刪除對話 (Shift+Delete)"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:67
 msgid "Move conversation to Trash (Delete, Backspace)"
 msgstr "將對話搬移至垃圾桶 (Delete、Backspace)"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:68
 msgid "Move conversations to Trash (Delete, Backspace)"
 msgstr "將對話搬移至垃圾桶 (Delete、Backspace)"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "封存(_A)"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "封存對話 (A)"
 
-#: ../src/client/application/geary-controller.vala:75
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "更多對話封存對話 (A)"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "標記為垃圾郵件(_P)"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "標記為非垃圾郵件(_P)"
 
-#: ../src/client/application/geary-controller.vala:81
-#: ../src/client/application/geary-controller.vala:397
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
 msgid "Mark conversation"
 msgstr "標記對話"
 
-#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "標記對話"
 
-#: ../src/client/application/geary-controller.vala:83
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "貼加標籤到對話"
 
-#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "貼加標籤到對話"
 
-#: ../src/client/application/geary-controller.vala:85
-#: ../src/client/application/geary-controller.vala:436
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
 msgid "Move conversation"
 msgstr "更多對話"
 
-#: ../src/client/application/geary-controller.vala:86
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "更多對話"
 
-#: ../src/client/application/geary-controller.vala:373
+#: ../src/client/application/geary-controller.vala:372
 msgid "A_ccounts"
 msgstr "帳號(_C)"
 
-#: ../src/client/application/geary-controller.vala:378
+#: ../src/client/application/geary-controller.vala:377
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
 
-#: ../src/client/application/geary-controller.vala:382
+#: ../src/client/application/geary-controller.vala:381
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "幫助(_H)"
 
-#: ../src/client/application/geary-controller.vala:386
+#: ../src/client/application/geary-controller.vala:385
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../src/client/application/geary-controller.vala:390
-msgid "_Donate"
-msgstr "捐款(_D)"
-
-#: ../src/client/application/geary-controller.vala:394
+#: ../src/client/application/geary-controller.vala:389
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../src/client/application/geary-controller.vala:399
+#: ../src/client/application/geary-controller.vala:394
 msgid "_Mark as..."
 msgstr "標記為(_M)..."
 
-#: ../src/client/application/geary-controller.vala:405
+#: ../src/client/application/geary-controller.vala:400
 msgid "Mark as _Read"
 msgstr "標記為已讀(_R)"
 
-#: ../src/client/application/geary-controller.vala:411
+#: ../src/client/application/geary-controller.vala:406
 msgid "Mark as _Unread"
 msgstr "標記為未讀(_U)"
 
-#: ../src/client/application/geary-controller.vala:417
+#: ../src/client/application/geary-controller.vala:412
 msgid "_Star"
 msgstr "標星(_S)"
 
-#: ../src/client/application/geary-controller.vala:422
+#: ../src/client/application/geary-controller.vala:417
 msgid "U_nstar"
 msgstr "取消標星(_N)"
 
-#: ../src/client/application/geary-controller.vala:432
+#: ../src/client/application/geary-controller.vala:427
 msgid "Add label"
 msgstr "加入標籤"
 
-#: ../src/client/application/geary-controller.vala:433
+#: ../src/client/application/geary-controller.vala:428
 msgid "_Label"
 msgstr "標籤(_L)"
 
-#: ../src/client/application/geary-controller.vala:437
+#: ../src/client/application/geary-controller.vala:432
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../src/client/application/geary-controller.vala:441
+#: ../src/client/application/geary-controller.vala:436
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "編撰新訊息 (Ctrl+N、N)"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:445
+#: ../src/client/application/geary-controller.vala:440
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1857
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: ../src/client/application/geary-controller.vala:446
+#: ../src/client/application/geary-controller.vala:441
 msgid "Reply (Ctrl+R, R)"
 msgstr "回覆 (Ctrl+R、R)"
 
-#: ../src/client/application/geary-controller.vala:450
+#: ../src/client/application/geary-controller.vala:445
 msgid "R_eply All"
 msgstr "回覆所有人(_E)"
 
-#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/application/geary-controller.vala:446
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "回覆所有人 (Ctrl+Shift+R、Shift+R)"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/application/geary-controller.vala:451
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1867
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: ../src/client/application/geary-controller.vala:457
+#: ../src/client/application/geary-controller.vala:452
 msgid "Forward (Ctrl+L, F)"
 msgstr "轉寄 (Ctrl+L、F)"
 
-#: ../src/client/application/geary-controller.vala:496
+#: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
 msgstr "淨空"
 
-#: ../src/client/application/geary-controller.vala:497
+#: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
 msgstr "淨空垃圾信或垃圾桶資料夾"
 
-#: ../src/client/application/geary-controller.vala:501
+#: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
 msgstr "淨空垃圾信(_S)…"
 
-#: ../src/client/application/geary-controller.vala:505
+#: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
 msgstr "淨空垃圾桶(_T)…"
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:538
+#: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
 msgstr "開關搜尋列"
 
-#: ../src/client/application/geary-controller.vala:752
+#: ../src/client/application/geary-controller.vala:746
 msgid "Unable to store server trust exception"
 msgstr "無法儲存伺服器信任例外"
 
-#: ../src/client/application/geary-controller.vala:989
+#: ../src/client/application/geary-controller.vala:983
 msgid "Your settings are insecure"
 msgstr "您的設定並不安全"
 
-#: ../src/client/application/geary-controller.vala:990
+#: ../src/client/application/geary-controller.vala:984
 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 ""
-"您的 IMAP 與/或 SMTP 設定中沒有指定 SSL 或 TLS。這代表您的使用者名稱與密碼可"
-"能被網路上的其他人讀取。您確定要這麼做?"
+"您的 IMAP 與/或 SMTP 設定中沒有指定 SSL 或 TLS。這代表您的使用者名稱與密碼可能被網路上的其他人讀取。您確定要這麼做?"
 
-#: ../src/client/application/geary-controller.vala:991
+#: ../src/client/application/geary-controller.vala:985
 msgid "Co_ntinue"
 msgstr "繼續(_N)"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/application/geary-controller.vala:1063
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "寄送電子郵件時發生錯誤"
 
-#: ../src/client/application/geary-controller.vala:1070
+#: ../src/client/application/geary-controller.vala:1064
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
-msgstr ""
-"Geary 在寄送電子郵件時遭遇錯誤。如果問題持續發生,請從您的寄件匣資料夾中手動"
-"刪除該封電子郵件。"
+msgstr "Geary 在寄送電子郵件時遭遇錯誤。如果問題持續發生,請從您的寄件匣資料夾中手動刪除該封電子郵件。"
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/application/geary-controller.vala:1068
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "儲存郵件時發生錯誤"
 
-#: ../src/client/application/geary-controller.vala:1075
+#: ../src/client/application/geary-controller.vala:1069
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
-msgstr ""
-"Geary 將寄送的訊息儲存至已寄送郵件時遭遇錯誤。這封訊息會留在您的寄件匣資料夾"
-"中,直到您刪除該封電子郵件為止。"
+msgstr "Geary 將寄送的訊息儲存至已寄送郵件時遭遇錯誤。這封訊息會留在您的寄件匣資料夾中,直到您刪除該封電子郵件為止。"
 
-#: ../src/client/application/geary-controller.vala:1144
+#: ../src/client/application/geary-controller.vala:1138
 msgid "Labels"
 msgstr "標籤"
 
-#. 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:1156
-#, c-format
+#: ../src/client/application/geary-controller.vala:1150
 msgid "Unable to open the database for %s"
 msgstr "無法為 %s 開啟資料庫"
 
-#: ../src/client/application/geary-controller.vala:1157
-#, c-format
+#: ../src/client/application/geary-controller.vala:1151
 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"
@@ -523,31 +487,27 @@ msgid ""
 "Rebuilding the database will destroy all local email and its attachments. "
 "<b>The mail on the your server will not be affected.</b>"
 msgstr ""
-"為此帳號開啟本地端郵件資料庫時發生錯誤。這可能是因為此目錄中的資料庫檔案已損"
-"毀:\n"
+"為此帳號開啟本地端郵件資料庫時發生錯誤。這可能是因為此目錄中的資料庫檔案已損毀:\n"
 "\n"
 "%s\n"
 "\n"
 "Geary 可以重建開資料庫並重新與伺服器同步,又或者直接離開。\n"
 "\n"
-"重建資料庫會銷毀所有本地端的郵件與其相關附件。<b>您在伺服器上的郵件則不會受影"
-"響。</b>"
+"重建資料庫會銷毀所有本地端的郵件與其相關附件。<b>您在伺服器上的郵件則不會受影響。</b>"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "_Rebuild"
 msgstr "重建(_R)"
 
-#: ../src/client/application/geary-controller.vala:1159
+#: ../src/client/application/geary-controller.vala:1153
 msgid "E_xit"
 msgstr "離開(_X)"
 
-#: ../src/client/application/geary-controller.vala:1168
-#, c-format
+#: ../src/client/application/geary-controller.vala:1162
 msgid "Unable to rebuild database for \"%s\""
 msgstr "無法重建「%s」資料庫"
 
-#: ../src/client/application/geary-controller.vala:1169
-#, c-format
+#: ../src/client/application/geary-controller.vala:1163
 msgid ""
 "Error during rebuild:\n"
 "\n"
@@ -557,17 +517,13 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1191
-#: ../src/client/application/geary-controller.vala:1201
-#: ../src/client/application/geary-controller.vala:1212
-#, c-format
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
 msgid "Unable to open local mailbox for %s"
 msgstr "無法為 %s 開啟本地端收信匣"
 
-#: ../src/client/application/geary-controller.vala:1192
-#, c-format
+#: ../src/client/application/geary-controller.vala:1186
 msgid ""
 "There was an error opening the local mail database for this account. This is "
 "possibly due to a file permissions problem.\n"
@@ -577,14 +533,13 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"開啟此帳號的本地端郵件資料庫時發生錯誤。這可能是因為檔案權限設定有問題所造"
-"成。\n"
+"開啟此帳號的本地端郵件資料庫時發生錯誤。這可能是因為檔案權限設定有問題所造成。\n"
 "\n"
 "請檢查您是否擁有此目錄中所有檔案的讀/寫權:\n"
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1202
+#: ../src/client/application/geary-controller.vala:1196
 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 "
@@ -592,12 +547,11 @@ msgid ""
 "\n"
 "Please install the latest version of Geary and try again."
 msgstr ""
-"本地端郵件資料庫的版本號格式為新版 Geary 所採用。不幸的是,該版本的 Geary 無"
-"法「回溯」處理資料庫。\n"
+"本地端郵件資料庫的版本號格式為新版 Geary 所採用。不幸的是,該版本的 Geary 無法「回溯」處理資料庫。\n"
 "\n"
 "請安裝最新版的 Geary 並重試。"
 
-#: ../src/client/application/geary-controller.vala:1213
+#: ../src/client/application/geary-controller.vala:1207
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -608,320 +562,533 @@ msgstr ""
 "\n"
 "請檢查您的網路連線,並重新啟動 Geary。"
 
-#: ../src/client/application/geary-controller.vala:1721
-#, c-format
+#: ../src/client/application/geary-controller.vala:1715
 msgid "About %s"
 msgstr "關於 %s"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada taro example com>
-#: ../src/client/application/geary-controller.vala:1724
+#: ../src/client/application/geary-controller.vala:1718
 msgid "translator-credits"
-msgstr "Cheng-Chia Tseng <pswo10680 gmail com>, 2012-2015."
+msgstr ""
+"Cheng-Chia Tseng <pswo10680 gmail com>, 2012-2015.\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Cheng-Chia Tseng https://launchpad.net/~zerng07";
 
-#: ../src/client/application/geary-controller.vala:1990
+#: ../src/client/application/geary-controller.vala:1976
 msgid "Undo move (Ctrl+Z)"
 msgstr "取消移動 (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2000
-#, c-format
+#: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "您確定您想要開啟「%s」嗎?"
 
-#: ../src/client/application/geary-controller.vala:2001
+#: ../src/client/application/geary-controller.vala:1987
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
 msgstr "開啟附件可能有機會損害您的系統。請只開啟源自受信任來源的檔案。"
 
-#: ../src/client/application/geary-controller.vala:2002
+#: ../src/client/application/geary-controller.vala:1988
 msgid "Don't _ask me again"
 msgstr "之後不要再問我(_A)"
 
-#: ../src/client/application/geary-controller.vala:2020
-#, c-format
+#: ../src/client/application/geary-controller.vala:2006
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "已經存在檔案名稱「%s」。您想要替換它嗎?"
 
-#: ../src/client/application/geary-controller.vala:2022
-#, c-format
+#: ../src/client/application/geary-controller.vala:2008
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "「%s」中已經存在該檔案。替換它將覆寫其內容。"
 
-#: ../src/client/application/geary-controller.vala:2025
+#: ../src/client/application/geary-controller.vala:2011
 msgid "_Replace"
 msgstr "替換(_R)"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2323
+#: ../src/client/application/geary-controller.vala:2309
 msgid "Close open draft messages?"
 msgstr "關閉開啟的草稿訊息?"
 
-#: ../src/client/application/geary-controller.vala:2453
-#, c-format
+#: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
 msgstr "是否要從您的 %s 資料夾中淨空所有的電子郵件?"
 
-#: ../src/client/application/geary-controller.vala:2454
+#: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
 msgstr "這會從 Geary 與您的電子郵件伺服器移除電子郵件。"
 
-#: ../src/client/application/geary-controller.vala:2455
+#: ../src/client/application/geary-controller.vala:2441
 msgid "This cannot be undone."
 msgstr "這個動作無法復原。"
 
-#: ../src/client/application/geary-controller.vala:2456
-#, c-format
+#: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
 msgstr "淨空 %s"
 
-#: ../src/client/application/geary-controller.vala:2473
-#, c-format
+#: ../src/client/application/geary-controller.vala:2459
 msgid "Error emptying %s"
 msgstr "淨空 %s 時發生錯誤"
 
-#: ../src/client/application/geary-controller.vala:2503
+#: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "您是否想永久刪除這些訊息?"
 
-#: ../src/client/application/geary-controller.vala:2505
+#: ../src/client/application/geary-controller.vala:2491
 msgid "Delete"
 msgstr "刪除"
 
-#: ../src/client/application/geary-controller.vala:2536
+#: ../src/client/application/geary-controller.vala:2522
 msgid "Undo archive (Ctrl+Z)"
 msgstr "取消封存 (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2551
+#: ../src/client/application/geary-controller.vala:2537
 msgid "Undo trash (Ctrl+Z)"
 msgstr "取消丟到垃圾桶 (Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2604
+#: ../src/client/application/geary-controller.vala:2590
 msgid "Undo (Ctrl+Z)"
 msgstr "取消 (Ctrl+Z)"
 
-#: ../src/client/components/conversation-find-bar.vala:214
-#, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "%i 項符合結果"
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "啟動 Geary 並隱藏主視窗"
 
-#: ../src/client/components/conversation-find-bar.vala:216
-#, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "%i 項符合結果 (前後循環)"
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "輸出除錯用資訊"
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "找不到"
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "紀錄對話監視"
 
-#: ../src/client/components/main-window.vala:428
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "紀錄網路去序列化"
 
-#: ../src/client/components/search-bar.vala:10
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "搜尋"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "紀錄網路活動"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:25
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "以關鍵字搜尋帳號中的所有郵件 (Ctrl+S)"
+#. / 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 "紀錄 IMAP replay 佇列"
 
-#: ../src/client/components/search-bar.vala:118
-#, c-format
-msgid "Indexing %s account"
-msgstr "正為 %s 帳號製作索引"
+#. / 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 "紀錄網路序列化"
 
-#: ../src/client/components/search-bar.vala:129
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "搜尋 %s 帳號"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "紀錄週期性活動"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../src/client/components/status-bar.vala:26
-msgid "Sending..."
-msgstr "正寄送中..."
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "紀錄資料庫查詢 (會產生大量訊息)"
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
-msgid "_OK"
-msgstr "確定(_O)"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "紀錄資料夾一般化"
 
-#: ../src/client/components/stock.vala:19
-#: ../ui/edit_alternate_emails.glade.h:3 ../ui/password-dialog.glade.h:5
-#: ../ui/remove_confirm.glade.h:5
-msgid "_Cancel"
-msgstr "取消(_C)"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "允許 WebView 的檢閱"
 
-#: ../src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "關閉(_C)"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "撤銷所有具 TLS 警告的伺服器憑證"
 
-#: ../src/client/components/stock.vala:24
-msgid "_Discard"
-msgstr "丟棄(_D)"
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr "顯示程式版本"
 
-#: ../src/client/components/stock.vala:26
-msgid "_Open"
-msgstr "開啟(_O)"
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr "使用 %s 開啟新的編撰器視窗"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
-msgstr "列印(_P)..."
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "請回報評註、建議與臭蟲至:"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
-msgid "_Remove"
-msgstr "移除(_R)"
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr "無法解析指令列選項:%s\n"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
-msgid "Select _All"
-msgstr "選取全部(_A)"
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "無法辨識的指令列選項「%s」\n"
 
-#: ../src/client/components/stock.vala:33
-msgid "_Keep"
-msgstr "保留(_K)"
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr "%s - 新訊息"
 
-#: ../src/client/composer/composer-widget.vala:73
-msgid "Saved"
-msgstr "已儲存"
+#: ../src/client/notification/libnotify.vala:72
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d 封新訊息"
 
-#: ../src/client/composer/composer-widget.vala:74
-msgid "Saving"
-msgstr "儲存中"
+#: ../src/client/notification/libnotify.vala:75
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s,總計 %d 封新訊息"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "Error saving"
-msgstr "儲存時發生錯誤"
+#: ../src/client/notification/libnotify.vala:107
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d 封其他新訊息,%s)"
 
-#: ../src/client/composer/composer-widget.vala:76
-msgid "Press Backspace to delete quote"
-msgstr "按下 Backspace 刪除引言"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "開啟"
 
-#: ../src/client/composer/composer-widget.vala:77
-msgid "New Message"
-msgstr "新訊息"
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "我"
 
-#. A 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:138
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr "未受信任的連線:%s"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr "%s 郵件伺服器 (位於 %s:%u) 的辨識身份無法通過核驗。"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
 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|附件|附上|附加"
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr "選取「信任這臺伺服器」或「總是信任這臺伺服器」有可能導致您的使用者名稱與密碼以不安全的方式傳送。"
 
-#: ../src/client/composer/composer-widget.vala:1102
-#: ../src/client/composer/composer-widget.vala:1106
-msgid "Do you want to discard this message?"
-msgstr "您是否想丟棄此封訊息?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr "選取「不要信任這臺伺服器」會導致 Geary 無法存取這臺伺服器。"
 
-#: ../src/client/composer/composer-widget.vala:1262
-msgid "Send message with an empty subject and body?"
-msgstr "是否要寄送主旨與內文皆空白的訊息?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Geary 不會加入或更新這個電子信箱帳號。"
 
-#: ../src/client/composer/composer-widget.vala:1264
-msgid "Send message with an empty subject?"
-msgstr "是否要寄送主旨空白的訊息?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr "選取「不要信任這臺伺服器」會導致 Geary 停止這個帳號的存取。"
 
-#: ../src/client/composer/composer-widget.vala:1266
-msgid "Send message with an empty body?"
-msgstr "是否要寄送沒有內文的訊息?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr "如果您沒有其他開啟的電子郵件帳號,Geary 將離開。"
 
-#: ../src/client/composer/composer-widget.vala:1268
-msgid "Send message without an attachment?"
-msgstr "是否要寄送沒有附件的訊息?"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr "若您對於這些問題有任何疑問,請聯絡您的系統管理員或電子郵件服務商。"
 
-#: ../src/client/composer/composer-widget.vala:1530
-msgid "Cannot add attachment"
-msgstr "無法加入附件"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr "伺服器的憑證並非由已知的授權中心簽署"
 
-#: ../src/client/composer/composer-widget.vala:1541
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "「%s」無法找到。"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr "伺服器的辨識身份與憑證的辨識身份並不相同"
 
-#: ../src/client/composer/composer-widget.vala:1548
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "「%s」是資料夾。"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "伺服器的憑證已經過期"
 
-#: ../src/client/composer/composer-widget.vala:1555
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "「%s」是空白檔案。"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "伺服器的憑證尚未啟用"
 
-#: ../src/client/composer/composer-widget.vala:1569
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "「%s」無法開啟以供讀取。"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "伺服器的憑證已經撤銷,目前無效"
 
-#: ../src/client/composer/composer-widget.vala:1576
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "「%s」已附上可供郵遞。"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "伺服器的憑證被視為不安全"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1585
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr "處理伺服器的憑證時遭遇錯誤。"
 
-#: ../src/client/composer/composer-widget.vala:1645
-msgid "To: "
-msgstr "收件者:"
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr "Geary 需要您的電子郵件密碼才能繼續"
 
-#: ../src/client/composer/composer-widget.vala:1648
-msgid "Cc: "
-msgstr "副本:"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "選擇一個檔案"
 
-#: ../src/client/composer/composer-widget.vala:1651
-msgid "Bcc: "
-msgstr "密件副本:"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "附加(_A)"
 
-#: ../src/client/composer/composer-widget.vala:1654
-msgid "Reply-To: "
-msgstr "回覆:"
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr "%s 的其他位址"
 
-#: ../src/client/composer/composer-widget.vala:1887
-msgid "Select Color"
-msgstr "選取色彩"
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "帳號"
 
-#. 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:2322
-#, c-format
-msgid "%1$s via %2$s"
-msgstr "%1$s 經由 %2$s"
+#. / 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 "名字 姓氏"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2364
-msgid "_From:"
-msgstr "寄件者(_F):"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "歡迎使用 Geary。"
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "我"
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "請輸入您的帳戶資訊以開始使用。"
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "2 週前"
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "1 個月前"
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "3 週前"
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "6 週前"
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "1 年前"
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "2 年前"
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "4 年前"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "每件"
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "編輯"
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr "預覽"
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "記住密碼(_B)"
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr "記住密碼(_B)"
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "無法成功驗證:\n"
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; 帳號暱稱無效。\n"
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; 電子郵件位址已加入 Geary。\n"
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; IMAP 連線錯誤。\n"
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; IMAP 使用者名稱或密碼不正確。\n"
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; SMTP 連線錯誤。\n"
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; SMTP  使用者名稱或密碼不正確。\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr "        &#8226;連線錯誤 。\n"
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; 使用者名稱或密碼不正確。\n"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "儲存(_S)"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "加入(_A)"
+
+#. / 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 "%P %l:%M"
+
+#. / 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 "%P %l:%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 "%b%-e日"
+
+#. / 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 "%Y年%b%-e日 %P %-l:%M"
+
+#. / 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 "%Y年%b%-e日 %-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 "%Y年%b%-e日 %P %-l:%M"
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "現在"
+
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "%d分鐘前"
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "%d小時前"
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "昨日"
+
+#. / 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
+msgid "%A"
+msgstr "%A"
+
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "位元組"
+
+#: ../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/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d 封訊息"
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d 封未讀"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s,%s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "收信匣"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr "搜尋 %s 帳號"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d 項結果"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "未選取對話。"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:415
-#, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
 msgstr[0] "%u 則對話已選取。"
@@ -975,39 +1142,35 @@ msgid "Date:"
 msgstr "日期:"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1139
-#, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
 msgstr[0] "%u 封已讀訊息"
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1271
-#, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr "這封訊息已成功寄送,但無法到 %s。"
 
-#. Add a menu item for copying the current selection.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
-#: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "複製(_C)"
 
-#. Add a menu item for copying the address.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1305
 msgid "Copy _Email Address"
 msgstr "複製電子郵件位址(_E)"
 
-#. Add a menu item for copying the link.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
-#: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "複製連結(_L)"
 
-#. Select message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1318
 msgid "Select _Message"
 msgstr "選取訊息(_M)"
 
-#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr "選取全部(_A)"
+
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1330
 msgid "_Inspect"
 msgstr "檢閱(_I)"
@@ -1020,7 +1183,6 @@ msgstr "此連結似乎要前往"
 msgid "but actually goes to"
 msgstr "但實際上卻連往"
 
-#. If href doesn't look like a URL, something is fishy, so warn the user
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1612
 msgid " (Invalid?)"
 msgstr " (無效?)"
@@ -1042,12 +1204,10 @@ msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] "儲存所有附件(_T)..."
 
-#. Reply to all on a message.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1862
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
-#. Mark as read/unread.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1879
 msgid "_Mark as Read"
 msgstr "標記為已讀(_M)"
@@ -1060,1046 +1220,613 @@ msgstr "標記為未讀(_M)"
 msgid "Mark Unread From _Here"
 msgstr "從此處起標記為未讀(_H)"
 
-#. Separator.
-#. View original message source.
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1904
 msgid "_View Source"
 msgstr "檢視來源(_V)"
 
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
-#: ../src/engine/rfc822/rfc822-utils.vala:378
-msgid "none"
-msgstr "無"
-
 #: ../src/client/conversation-viewer/conversation-viewer.vala:2362
 msgid "Failed to open default text editor."
 msgstr "無法開啟預設的文字編輯器。"
 
 #: ../src/client/conversation-viewer/conversation-web-view.vala:322
-#, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s - 對話檢閱器"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "選擇一個檔案"
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "已儲存"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "附加(_A)"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "儲存中"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
-#, c-format
-msgid "Untrusted Connection: %s"
-msgstr "未受信任的連線:%s"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "儲存時發生錯誤"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
-#, c-format
-msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr "%s 郵件伺服器 (位於 %s:%u) 的辨識身份無法通過核驗。"
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "按下 Backspace 刪除引言"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "新訊息"
+
+#: ../src/client/composer/composer-widget.vala:138
 msgid ""
-"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-"your username and password to be transmitted insecurely."
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
 msgstr ""
-"選取「信任這臺伺服器」或「總是信任這臺伺服器」有可能導致您的使用者名稱與密碼"
-"以不安全的方式傳送。"
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures|附件|附上|附加"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-"server."
-msgstr "選取「不要信任這臺伺服器」會導致 Geary 無法存取這臺伺服器。"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "您是否想丟棄此封訊息?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
-msgid "Geary will not add or update this email account."
-msgstr "Geary 不會加入或更新這個電子信箱帳號。"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "是否要寄送主旨與內文皆空白的訊息?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
-msgid ""
-"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-"this account."
-msgstr "選取「不要信任這臺伺服器」會導致 Geary 停止這個帳號的存取。"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "是否要寄送主旨空白的訊息?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr "如果您沒有其他開啟的電子郵件帳號,Geary 將離開。"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "是否要寄送沒有內文的訊息?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
-msgid ""
-"Contact your system administrator or email service provider if you have any "
-"question about these issues."
-msgstr "若您對於這些問題有任何疑問,請聯絡您的系統管理員或電子郵件服務商。"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "是否要寄送沒有附件的訊息?"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
-msgstr "伺服器的憑證並非由已知的授權中心簽署"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "無法加入附件"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
-msgid "The server's identity does not match the identity in the certificate"
-msgstr "伺服器的辨識身份與憑證的辨識身份並不相同"
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr "「%s」無法找到。"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
-msgid "The server's certificate has expired"
-msgstr "伺服器的憑證已經過期"
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "「%s」是資料夾。"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
-msgid "The server's certificate has not been activated"
-msgstr "伺服器的憑證尚未啟用"
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "「%s」是空白檔案。"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
-msgid "The server's certificate has been revoked and is now invalid"
-msgstr "伺服器的憑證已經撤銷,目前無效"
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr "「%s」無法開啟以供讀取。"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
-msgid "The server's certificate is considered insecure"
-msgstr "伺服器的憑證被視為不安全"
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr "「%s」已附上可供郵遞。"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
-msgid "An error has occurred processing the server's certificate"
-msgstr "處理伺服器的憑證時遭遇錯誤。"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. 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 "Geary requires your email password to continue"
-msgstr "Geary 需要您的電子郵件密碼才能繼續"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "收件者: "
 
-#. 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 封訊息"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "副本: "
 
-#. / 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 封未讀"
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "密件副本: "
 
-#. / 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/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr "回覆: "
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "收信匣"
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "選取色彩"
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr[0] "%d 項結果"
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr "%1$s 經由 %2$s"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - 新訊息"
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "寄件者(_F):"
 
-#: ../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d 封新訊息"
+#: ../src/client/components/main-window.vala:388
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../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 封新訊息"
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "正寄送中..."
 
-#: ../src/client/notification/libnotify.vala:107
-#, 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 封其他新訊息,%s)"
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i 項符合結果"
 
-#: ../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "開啟"
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i 項符合結果 (前後循環)"
 
-#. / 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 "%P %l:%M"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "找不到"
 
-#. / 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"
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "確定(_O)"
 
-#. / 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 "%P %l:%M"
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "取消(_C)"
 
-#. / 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 "%b%-e日"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "關閉(_C)"
 
-#. / 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"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "丟棄(_D)"
 
-#. / 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 "%Y年%b%-e日 %P %-l:%M"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "開啟(_O)"
 
-#. / 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 "%Y年%b%-e日 %-H:%M"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "列印(_P)..."
 
-#. / 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 "%Y年%b%-e日 %P %-l:%M"
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr "移除(_R)"
 
-#: ../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "現在"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "保留(_K)"
 
-#: ../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgid_plural "%dm ago"
-msgstr[0] "%d分鐘前"
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "以關鍵字搜尋帳號中的所有郵件 (Ctrl+S)"
 
-#: ../src/client/util/util-date.vala:171
-#, c-format
-msgid "%dh ago"
-msgid_plural "%dh ago"
-msgstr[0] "%d小時前"
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr "正為 %s 帳號製作索引"
 
-#: ../src/client/util/util-date.vala:178
-msgid "Yesterday"
-msgstr "昨日"
+#~ msgid "Geary"
+#~ msgstr "Geary"
 
-#. / 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"
+#~ msgid "Geary Mail"
+#~ msgstr "Geary 郵件"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:781
-msgid "(no subject)"
-msgstr "(無主旨)"
+#~ msgid "Send and receive email"
+#~ msgstr "寄送與收受郵件"
 
-#: ../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "位元組"
+#~ msgid "Email;E-mail;Mail;"
+#~ msgstr "Email;E-mail;Mail;電子郵件;電郵;郵件;信件;收信;寄信;"
 
-#: ../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#~ msgid "Compose Message"
+#~ msgstr "編撰訊息"
 
-#: ../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#~ msgid "Send by email"
+#~ msgstr "透過電子郵件寄送"
 
-#: ../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#~ msgid "Send files using Geary"
+#~ msgstr "使用 Geary 傳送檔案"
 
-#: ../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#~ msgid "_Donate"
+#~ msgstr "捐款(_D)"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr "<span weight=\"bold\" size=\"larger\">無法移除帳號</span> "
 
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr "與此帳號相關連的編撰器目前已開啟。寄送訊息或放棄訊息,接著重試一次。"
 
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#~ msgid "Add account"
+#~ msgstr "加入帳號"
 
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "其他"
+#~ msgid "Edit account"
+#~ msgstr "編輯帳號"
 
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
+#~ msgid "Remove account"
+#~ msgstr "移除帳號"
 
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "請稍後,Geary 正在驗明您的帳號。"
 
-#: ../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "收信匣"
+#~ msgid "Untrusted Connection"
+#~ msgstr "未受信任的連線"
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "草稿"
+#~ msgid "_Always Trust This Server"
+#~ msgstr "永遠信任這臺伺服器(_A)"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "已寄郵件"
+#~ msgid "_Trust This Server"
+#~ msgstr "信任這臺伺服器(_T)"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "已標星"
+#~ msgid "_Don't Trust This Server"
+#~ msgstr "不要信任這臺伺服器(_D)"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "重要"
+#~ msgid "_Undo"
+#~ msgstr "取消動作(_U)"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "所有郵件"
+#~ msgid "_Redo"
+#~ msgstr "再次動作(_R)"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "垃圾郵件"
+#~ msgid "Cu_t"
+#~ msgstr "剪下(_T)"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "垃圾桶"
+#~ msgid "_Paste"
+#~ msgstr "貼上(_P)"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "寄件匣"
+#~ msgid "_Left"
+#~ msgstr "左(_L)"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr "封存"
+#~ msgid "_Right"
+#~ msgstr "右(_R)"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-msgstr "無"
+#~ msgid "_Center"
+#~ msgstr "置中(_C)"
 
-#. Map of user-supplied search field names to column names.
-#. / Can be typed in the search box like attachment:file.txt to find
-#. / messages with attachments with a particular name.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:710
-msgid "attachment"
-msgstr "附件"
+#~ msgid "_Justify"
+#~ msgstr "左右對齊(_J)"
 
-#. / 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 match the string in Geary's help documentation.
-#. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:714
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "bcc"
-msgstr "密件副本"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "連結 (Ctrl+L)"
 
-#. / Can be typed in the search box like body:word to find the word only
-#. / if it occurs in the body of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:718
-msgid "body"
-msgstr "正文"
+#~ msgid "C_olor"
+#~ msgstr "色彩(_O)"
 
-#. / 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 match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:722
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "cc"
-msgstr "副本"
+#~ msgid "More options"
+#~ msgstr "更多選項"
 
-#. / Can be typed in the search box like from:johndoe example com to
-#. / find messages from a particular sender.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:726
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "from"
-msgstr "寄件者"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "引用文字 (Ctrl+])"
 
-#. / Can be typed in the search box like subject:word to find the word
-#. / only if it occurs in the subject of a message.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:730
-msgid "subject"
-msgstr "主旨"
+#~ msgid "Unquote text (Ctrl+[)"
+#~ msgstr "取消文字引用 (Ctrl+[)"
 
-#. / Can be typed in the search box like to:johndoe example com to find
-#. / messages received by a particular person.  The translated
-#. / string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:734
-#: ../src/engine/imap-db/imap-db-account.vala:738
-msgid "to"
-msgstr "收件者"
+#~ msgid "Remove formatting (Ctrl+Space)"
+#~ msgstr "移除格式化 (Ctrl+空白鍵)"
 
-#. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.  The translated
-#. string must match the string in Geary's help documentation.
-#: ../src/engine/imap-db/imap-db-account.vala:754
-msgid "me"
-msgstr "我"
+#~ msgctxt "Clipboard paste with rich text"
+#~ msgid "Paste _With Formatting"
+#~ msgstr "貼上格式化文字(_W)"
 
-#. List of folder names to match for Drafts, separated by |.  Please add localized common
-#. names for the Drafts folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
-msgid "Drafts | Draft"
-msgstr "草稿 | Drafts | Draft"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "粗體 (Ctrl+B)"
 
-#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
-#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr ""
-"已寄送 | 已送出 | 已寄送郵件 | 已寄送電子郵件 | Sent | Sent Mail | Sent "
-"Email | Sent E-Mail"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "斜體 (Ctrl+I)"
 
-#. List of folder names to match for Spam, separated by |.  Please add localized common
-#. names for the Spam folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
-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"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "底線 (Ctrl+U)"
 
-#. List of folder names to match for Trash, separated by |.  Please add localized common
-#. names for the Trash folder, leaving in the English names as well.  The first in the list
-#. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "垃圾桶 | 垃圾筒 | 回收筒 | 垃圾 | Trash | Rubbish | Rubbish Bin"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "刪劃線 (Ctrl+K)"
 
-#. / 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:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%Y年%b%-e日 %a %p %-l:%M"
+#~ msgid "_Rich Text"
+#~ msgstr "豐富文字(_R)"
 
-#. / 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:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "%2$s 於 %1$s 寫下:"
+#~ msgid "Show Extended Fields"
+#~ msgstr "顯示擴展欄位"
 
-#. / 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:228
-#, c-format
-msgid "%s wrote:"
-msgstr "%s 寫到:"
+#~ msgctxt "Label"
+#~ msgid "Close and Save"
+#~ msgstr "關閉並儲存"
 
-#. / 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:234
-#, c-format
-msgid "On %s:"
-msgstr "於 %s:"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "關閉並儲存"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "---------- 轉寄的訊息 ----------"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "關閉並儲存"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "寄件者:%s\n"
+#~ msgctxt "Label"
+#~ msgid "Close and Discard"
+#~ msgstr "關閉並捨棄"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "主旨:%s\n"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "關閉並捨棄"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "日期:%s\n"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "關閉並捨棄"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "收件者:%s\n"
+#~ msgid "Lar_ge"
+#~ msgstr "大型(_G)"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
-msgstr "副本:%s\n"
+#~ msgid "Large"
+#~ msgstr "大型"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">無法移除帳號</span> "
+#~ msgid "_Medium"
+#~ msgstr "中型(_M)"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr "與此帳號相關連的編撰器目前已開啟。寄送訊息或放棄訊息,接著重試一次。"
-
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "加入帳號"
-
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "編輯帳號"
-
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "移除帳號"
-
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "請稍後,Geary 正在驗明您的帳號。"
-
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "未受信任的連線"
-
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "永遠信任這臺伺服器(_A)"
-
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "信任這臺伺服器(_T)"
-
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "不要信任這臺伺服器(_D)"
-
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "取消動作(_U)"
-
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "再次動作(_R)"
-
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "剪下(_T)"
-
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "貼上(_P)"
-
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "左(_L)"
-
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "右(_R)"
-
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "置中(_C)"
-
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "左右對齊(_J)"
-
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "連結 (Ctrl+L)"
-
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "色彩(_O)"
-
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "更多選項"
-
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "引用文字 (Ctrl+])"
-
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "取消文字引用 (Ctrl+[)"
-
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "移除格式化 (Ctrl+空白鍵)"
-
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "貼上格式化文字(_W)"
-
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "粗體 (Ctrl+B)"
-
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "斜體 (Ctrl+I)"
-
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "底線 (Ctrl+U)"
-
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "刪劃線 (Ctrl+K)"
-
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "豐富文字(_R)"
-
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "顯示擴展欄位"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "關閉並儲存"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "關閉並儲存"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "關閉並儲存"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "關閉並捨棄"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "關閉並捨棄"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "關閉並捨棄"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "大型(_G)"
-
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "大型"
-
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "中型(_M)"
-
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "中型"
-
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "小型(_S)"
-
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "小型"
-
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "無襯線(_A)"
-
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "無襯線"
-
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "有襯線(_E)"
-
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "有襯線"
-
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "等寬(_F)"
-
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "等寬"
-
-#: ../ui/composer.glade.h:42
-msgid "Detach"
-msgstr "卸除"
-
-#: ../ui/composer.glade.h:43
-msgid "Detach (Ctrl+D)"
-msgstr "卸除 (Ctrl+D)"
-
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "寄送(_S)"
-
-#: ../ui/composer.glade.h:45
-msgid "Send"
-msgstr "寄送"
-
-#: ../ui/composer.glade.h:46
-msgid "Send (Ctrl+Enter)"
-msgstr "寄送 (Ctrl+Enter)"
-
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "附加檔案(_A)"
-
-#: ../ui/composer.glade.h:48
-msgid "Attach File"
-msgstr "附加檔案"
-
-#: ../ui/composer.glade.h:49
-msgid "_Include Original Attachments"
-msgstr "包含原始附件(_I)"
-
-#: ../ui/composer.glade.h:50
-msgid "Include Original Attachments"
-msgstr "包含原始附件"
-
-#: ../ui/composer.glade.h:51
-msgid "Application Menu"
-msgstr "應用程式選單"
-
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:53
-msgid "_To"
-msgstr "收件者(_T)"
+#~ msgid "Medium"
+#~ msgstr "中型"
 
-#: ../ui/composer.glade.h:54
-msgid "_Cc"
-msgstr "副本(_C)"
+#~ msgid "_Small"
+#~ msgstr "小型(_S)"
 
-#: ../ui/composer.glade.h:55
-msgid "_Subject"
-msgstr "主旨(_S)"
+#~ msgid "Small"
+#~ msgstr "小型"
 
-#: ../ui/composer.glade.h:56
-msgid "_Bcc"
-msgstr "密件副本(_B)"
+#~ msgid "S_ans Serif"
+#~ msgstr "無襯線(_A)"
 
-#: ../ui/composer.glade.h:57
-msgid "_Reply-To"
-msgstr "回覆(_R)"
+#~ msgid "Sans Serif"
+#~ msgstr "無襯線"
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:59
-msgid "From"
-msgstr "寄件者"
+#~ msgid "S_erif"
+#~ msgstr "有襯線(_E)"
 
-#: ../ui/composer.glade.h:60
-msgid "Drop files here"
-msgstr "請將檔案拖曳至這裡"
+#~ msgid "Serif"
+#~ msgstr "有襯線"
 
-#: ../ui/composer.glade.h:61
-msgid "To add them as attachments"
-msgstr "以將它們添加為附件"
+#~ msgid "_Fixed Width"
+#~ msgstr "等寬(_F)"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-msgid "Remove email address"
-msgstr "移除電子郵件位址"
+#~ msgid "Fixed Width"
+#~ msgstr "等寬"
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"有些電子郵件服務需要在伺服器上設定其他地址。請聯絡您的電子郵件供應商瞭解相關"
-"資訊。"
+#~ msgid "Detach"
+#~ msgstr "卸除"
 
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "更新(_U)"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "卸除 (Ctrl+D)"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "尋找:"
+#~ msgid "_Send"
+#~ msgstr "寄送(_S)"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "上一個(_P)"
+#~ msgid "Send"
+#~ msgstr "寄送"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "下一個(_N)"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "寄送 (Ctrl+Enter)"
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "區分字母大小寫(_C)"
+#~ msgid "_Attach File"
+#~ msgstr "附加檔案(_A)"
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "標籤"
+#~ msgid "Attach File"
+#~ msgstr "附加檔案"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "密碼"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "包含原始附件(_I)"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "電子郵件位址(_M)"
+#~ msgid "Include Original Attachments"
+#~ msgstr "包含原始附件"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "密碼(_P)"
+#~ msgid "Application Menu"
+#~ msgstr "應用程式選單"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "服務(_E)"
+#~ msgid "_To"
+#~ msgstr "收件者(_T)"
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "名稱(_A)"
+#~ msgid "_Cc"
+#~ msgstr "副本(_C)"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "暱稱(_I)"
+#~ msgid "_Subject"
+#~ msgstr "主旨(_S)"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "辦公、住家...等。"
+#~ msgid "_Bcc"
+#~ msgstr "密件副本(_B)"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "儲存已寄郵件(_S)"
+#~ msgid "_Reply-To"
+#~ msgstr "回覆(_R)"
 
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
-msgstr "其他電子郵件位址(_T)…"
+#~ msgid "From"
+#~ msgstr "寄件者"
 
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "IMAP 設定"
+#~ msgid "Drop files here"
+#~ msgstr "請將檔案拖曳至這裡"
 
-#: ../ui/login.glade.h:12
-msgid "Se_rver"
-msgstr "伺服器(_R)"
+#~ msgid "To add them as attachments"
+#~ msgstr "以將它們添加為附件"
 
-#: ../ui/login.glade.h:13
-msgid "P_ort"
-msgstr "連接埠(_O)"
+#~ msgid "Remove email address"
+#~ msgstr "移除電子郵件位址"
 
-#: ../ui/login.glade.h:14
-msgid "Ser_ver"
-msgstr "伺服器(_V)"
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr "有些電子郵件服務需要在伺服器上設定其他地址。請聯絡您的電子郵件供應商瞭解相關資訊。"
 
-#: ../ui/login.glade.h:15
-msgid "Por_t"
-msgstr "連接埠(_T)"
+#~ msgid "_Update"
+#~ msgstr "更新(_U)"
 
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "SMTP 設定值"
+#~ msgid "Find:"
+#~ msgstr "尋找:"
 
-#: ../ui/login.glade.h:17
-msgid "User_name"
-msgstr "使用者名稱(_N)"
+#~ msgid "_Previous"
+#~ msgstr "上一個(_P)"
 
-#: ../ui/login.glade.h:18
-msgid "Pass_word"
-msgstr "密碼(_W)"
+#~ msgid "_Next"
+#~ msgstr "下一個(_N)"
 
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr "SMTP 使用者名稱"
+#~ msgid "_Case sensitive"
+#~ msgstr "區分字母大小寫(_C)"
 
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr "SMTP 密碼"
+#~ msgid "label"
+#~ msgstr "標籤"
 
-#: ../ui/login.glade.h:21
-msgid "_Username"
-msgstr "使用者名稱(_U)"
+#~ msgid "Password"
+#~ msgstr "密碼"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr "IMAP 使用者名稱"
+#~ msgid "E_mail address"
+#~ msgstr "電子郵件位址(_M)"
 
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr "IMAP 密碼"
+#~ msgid "_Password"
+#~ msgstr "密碼(_P)"
 
-#: ../ui/login.glade.h:24
-msgid "Encr_yption"
-msgstr "加密(_Y)"
+#~ msgid "S_ervice"
+#~ msgstr "服務(_E)"
 
-#: ../ui/login.glade.h:25
-msgid "Encrypt_ion"
-msgstr "加密(_I)"
+#~ msgid "N_ame"
+#~ msgstr "名稱(_A)"
 
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "N_ickname"
+#~ msgstr "暱稱(_I)"
 
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "Work, Home, etc."
+#~ msgstr "辦公、住家...等。"
 
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "不需要認證(_Q)"
+#~ msgid "_Save sent mail"
+#~ msgstr "儲存已寄郵件(_S)"
 
-#: ../ui/login.glade.h:30
-msgid "Use IMAP cre_dentials"
-msgstr "使用 IMAP 憑證(_D)"
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "其他電子郵件位址(_T)…"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "編撰器"
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP 設定"
 
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr "儲存伺服氣上的草稿(_F)"
+#~ msgid "Se_rver"
+#~ msgstr "伺服器(_R)"
 
-#: ../ui/login.glade.h:33
-msgid "Si_gn emails (HTML allowed):"
-msgstr "簽署電子郵件 (允許 HTML)(_G):"
+#~ msgid "P_ort"
+#~ msgstr "連接埠(_O)"
 
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "貯藏"
+#~ msgid "Ser_ver"
+#~ msgstr "伺服器(_V)"
 
-#: ../ui/login.glade.h:35
-msgid "_Download mail"
-msgstr "下載郵件(_D)"
+#~ msgid "Por_t"
+#~ msgstr "連接埠(_T)"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "SMTP 憑證"
+#~ msgid "SMTP settings"
+#~ msgstr "SMTP 設定值"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "使用者名稱"
+#~ msgid "User_name"
+#~ msgstr "使用者名稱(_N)"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "記住密碼(_R)"
+#~ msgid "Pass_word"
+#~ msgstr "密碼(_W)"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "核對身份(_A)"
+#~ msgid "SMTP username"
+#~ msgstr "SMTP 使用者名稱"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "閱讀"
+#~ msgid "SMTP password"
+#~ msgstr "SMTP 密碼"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "自動選取下篇訊息(_A)"
+#~ msgid "_Username"
+#~ msgstr "使用者名稱(_U)"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "顯示對話預覽(_D)"
+#~ msgid "IMAP username"
+#~ msgstr "IMAP 使用者名稱"
 
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr "使用三欄檢視(_T)"
+#~ msgid "IMAP password"
+#~ msgstr "IMAP 密碼"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "啟用拼字檢查(_S)"
+#~ msgid "Encr_yption"
+#~ msgstr "加密(_Y)"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "通知"
+#~ msgid "Encrypt_ion"
+#~ msgstr "加密(_I)"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "播放通知音效(_P)"
+#~ msgid "SSL/TLS"
+#~ msgstr "SSL/TLS"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "若有新郵件時顯示通知(_N)"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/preferences.glade.h:10
-msgid "Always _watch for new mail"
-msgstr "總是監視是否有新的郵件(_W)"
+#~ msgid "No authentication re_quired"
+#~ msgstr "不需要認證(_Q)"
 
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr "Geary 將在背景執行並通知新郵件的到來"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "使用 IMAP 憑證(_D)"
 
-#: ../ui/preferences.glade.h:12
-msgid "Preferences"
-msgstr "偏好設定"
+#~ msgid "Composer"
+#~ msgstr "編撰器"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">您是否確定要移除這個帳號?</span> "
+#~ msgid "Save dra_fts on server"
+#~ msgstr "儲存伺服氣上的草稿(_F)"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"所有與此帳號關聯的電子郵件都將從您的電腦中移去。但這不會影響位在伺服器上的電"
-"子郵件。"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "簽署電子郵件 (允許 HTML)(_G):"
+
+#~ msgid "Storage"
+#~ msgstr "貯藏"
+
+#~ msgid "_Download mail"
+#~ msgstr "下載郵件(_D)"
+
+#~ msgid "SMTP Credentials"
+#~ msgstr "SMTP 憑證"
+
+#~ msgid "Username"
+#~ msgstr "使用者名稱"
+
+#~ msgid "_Remember password"
+#~ msgstr "記住密碼(_R)"
+
+#~ msgid "_Authenticate"
+#~ msgstr "核對身份(_A)"
+
+#~ msgid "Reading"
+#~ msgstr "閱讀"
+
+#~ msgid "_Automatically select next message"
+#~ msgstr "自動選取下篇訊息(_A)"
+
+#~ msgid "_Display conversation preview"
+#~ msgstr "顯示對話預覽(_D)"
+
+#~ msgid "Use _three pane view"
+#~ msgstr "使用三欄檢視(_T)"
+
+#~ msgid "Enable _spell checking"
+#~ msgstr "啟用拼字檢查(_S)"
+
+#~ msgid "Notifications"
+#~ msgstr "通知"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "播放通知音效(_P)"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "若有新郵件時顯示通知(_N)"
+
+#~ msgid "Always _watch for new mail"
+#~ msgstr "總是監視是否有新的郵件(_W)"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr "Geary 將在背景執行並通知新郵件的到來"
+
+#~ msgid "Preferences"
+#~ msgstr "偏好設定"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+#~ "account?</span> "
+#~ msgstr "<span weight=\"bold\" size=\"larger\">您是否確定要移除這個帳號?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your computer. "
+#~ "This will not affect email on the server."
+#~ msgstr "所有與此帳號關聯的電子郵件都將從您的電腦中移去。但這不會影響位在伺服器上的電子郵件。"
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "暱稱:"
+#~ msgid "Nickname:"
+#~ msgstr "暱稱:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "電子郵件位址:"
+#~ msgid "Email address:"
+#~ msgstr "電子郵件位址:"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "Geary 正在更新…"
+#~ msgid "Geary update in progress…"
+#~ msgstr "Geary 正在更新…"
 
 #~ msgid "_Delete"
 #~ msgstr "刪除(_D)"
 
-#~| msgid "Trash"
 #~ msgid "_Trash"
 #~ msgstr "搬移到垃圾桶(_T)"
 
@@ -2109,14 +1836,12 @@ msgstr "Geary 正在更新…"
 #~ msgid "Do you want to discard the unsaved message?"
 #~ msgstr "您是否想丟棄尚未儲存的訊息?"
 
-#~| msgid "Please enter your email password"
 #~ msgid "Please enter your password"
 #~ msgstr "請輸入您的密碼"
 
 #~ msgid "Edit recipients"
 #~ msgstr "編輯收件人"
 
-#~| msgid "_Close"
 #~ msgid "C_lose"
 #~ msgstr "關閉(_C)"
 


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