[geary] Updated Ukrainian translation

[Daniel Korostil <dankor src gnome org>]

commit 8c6403c99a35963c4184e158a06f3025c94c8e96
Author: Daniel Korostil <ted korostiled gmail com>
Date:   Wed Mar 12 23:53:24 2014 +0200

    Updated Ukrainian translation

 po/uk.po |  570 ++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 336 insertions(+), 234 deletions(-)
---
diff --git a/po/uk.po b/po/uk.po
index f9644e1..c4d5b51 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,23 +10,21 @@
 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-01-13 21:59+0000\n"
-"PO-Revision-Date: 2014-02-08 14:48+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-12 22:50+0200\n"
+"PO-Revision-Date: 2014-03-12 23:12+0300\n"
 "Last-Translator: Daniel Korostil <ted korostiled gmail com>\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"
+"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"
 "X-Project-Style: gnome\n"
 
 #: ../desktop/geary.desktop.in.h:1
-#| msgid "Geary Mail"
 msgid "Geary"
 msgstr "Geary"
 
@@ -66,7 +64,7 @@ msgstr "_Додати"
 msgid "Accounts"
 msgstr "Облікові записи"
 
-#. Copyright 2011-2013 Yorba Foundation
+#. 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.
@@ -77,139 +75,140 @@ msgstr "Облікові записи"
 msgid "First Last"
 msgstr "Повне ім'я"
 
-#: ../src/client/accounts/add-edit-page.vala:190
+#: ../src/client/accounts/add-edit-page.vala:202
 msgid "Welcome to Geary."
 msgstr "Ласкаво просимо до Geary."
 
-#: ../src/client/accounts/add-edit-page.vala:190
+#: ../src/client/accounts/add-edit-page.vala:202
 msgid "Enter your account information to get started."
 msgstr "Введіть інформацію про ваш обліковий запис."
 
-#: ../src/client/accounts/add-edit-page.vala:210
+#: ../src/client/accounts/add-edit-page.vala:223
 msgid "2 weeks back"
 msgstr "2 тижні тому"
 
 #. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:211
+#: ../src/client/accounts/add-edit-page.vala:224
 msgid "1 month back"
 msgstr "1 місяць тому"
 
-#: ../src/client/accounts/add-edit-page.vala:212
+#: ../src/client/accounts/add-edit-page.vala:225
 msgid "3 months back"
 msgstr "3 місяці тому"
 
-#: ../src/client/accounts/add-edit-page.vala:213
+#: ../src/client/accounts/add-edit-page.vala:226
 msgid "6 months back"
 msgstr "6 місяців тому"
 
-#: ../src/client/accounts/add-edit-page.vala:214
+#: ../src/client/accounts/add-edit-page.vala:227
 msgid "1 year back"
 msgstr "1 рік тому"
 
+#: ../src/client/accounts/add-edit-page.vala:228
+msgid "2 years back"
+msgstr "2 роки тому"
+
+#: ../src/client/accounts/add-edit-page.vala:229
+msgid "4 years back"
+msgstr "4 роки тому"
+
 #. Separator
-#: ../src/client/accounts/add-edit-page.vala:216
+#: ../src/client/accounts/add-edit-page.vala:231
 msgid "Everything"
 msgstr "Загалом"
 
-#: ../src/client/accounts/add-edit-page.vala:583
+#: ../src/client/accounts/add-edit-page.vala:630
 msgid "Remem_ber passwords"
 msgstr "Запа_м'ятати паролі"
 
-#: ../src/client/accounts/add-edit-page.vala:590 ../ui/login.glade.h:6
+#: ../src/client/accounts/add-edit-page.vala:637 ../ui/login.glade.h:6
 msgid "Remem_ber password"
 msgstr "Запа_м'ятати пароль"
 
-#: ../src/client/accounts/add-edit-page.vala:619
+#: ../src/client/accounts/add-edit-page.vala:671
 msgid "Unable to validate:\n"
 msgstr "Неможливо підтвердити:\n"
 
-#: ../src/client/accounts/add-edit-page.vala:621
+#: ../src/client/accounts/add-edit-page.vala:673
 msgid "        &#8226; Invalid account nickname.\n"
 msgstr "        &#8226; Неправильний псевдонім облікового запису.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:624
+#: ../src/client/accounts/add-edit-page.vala:676
 msgid "        &#8226; Email address already added to Geary.\n"
 msgstr "        &#8226; Електрону адресу вже додано до Geary.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:628
+#: ../src/client/accounts/add-edit-page.vala:680
 msgid "        &#8226; IMAP connection error.\n"
 msgstr "        &#8226; Помилка з'єднання IMAP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:631
+#: ../src/client/accounts/add-edit-page.vala:683
 msgid "        &#8226; IMAP username or password incorrect.\n"
 msgstr "        &#8226; Неправильний користувач або пароль IMAP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:634
+#: ../src/client/accounts/add-edit-page.vala:686
 msgid "        &#8226; SMTP connection error.\n"
 msgstr "        &#8226; Помилка з'єднання SMTP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:637
+#: ../src/client/accounts/add-edit-page.vala:689
 msgid "        &#8226; SMTP username or password incorrect.\n"
 msgstr "        &#8226; Неправильний користувач або пароль SMTP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:641
+#: ../src/client/accounts/add-edit-page.vala:693
 msgid "        &#8226; Connection error.\n"
 msgstr "        &#8226; Помилка з'єднання.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:645
+#: ../src/client/accounts/add-edit-page.vala:697
 msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Неправильний користувач або пароль.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr "© 2011-2013 Yorba Foundation"
+msgid "Copyright 2011-2014 Yorba Foundation"
+msgstr "© 2011-2014 Yorba Foundation"
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
-msgstr "Відвідайте сайт Yorba"
+msgstr "Відвідати сайт Yorba"
 
 #: ../src/client/application/geary-args.vala:10
 msgid "Output debugging information"
 msgstr "Виводити зневаджувальну інформацію"
 
 #: ../src/client/application/geary-args.vala:11
-#, fuzzy
 msgid "Log conversation monitoring"
-msgstr "Log conversation monitoring"
+msgstr "Журнал спостереження за розмовами"
 
 #: ../src/client/application/geary-args.vala:12
 msgid "Log network deserialization"
-msgstr ""
+msgstr "Журнал мережевої десеріалізації"
 
 #: ../src/client/application/geary-args.vala:13
-#, fuzzy
 msgid "Log network activity"
-msgstr "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/application/geary-args.vala:16
-#, fuzzy
 msgid "Log IMAP replay queue"
-msgstr "Log IMAP replay queue"
+msgstr "Журнал черги відповідей IMAP"
 
 #. / Serialization is how commands and responses are converted into a stream of bytes for
 #. / network transmission
 #: ../src/client/application/geary-args.vala:19
-#, fuzzy
 msgid "Log network serialization"
-msgstr "Log network serialization"
+msgstr "Журнал мережевої серіалізації"
 
 #: ../src/client/application/geary-args.vala:20
-#, fuzzy
 msgid "Log periodic activity"
-msgstr "Log periodic activity"
+msgstr "Журнал періодичної діяльності"
 
 #: ../src/client/application/geary-args.vala:21
-#, fuzzy
 msgid "Log database queries (generates lots of messages)"
-msgstr "Log database queries (generates lots of messages)"
+msgstr "Журнал запитів баз даних (породжує багато повідомлень)"
 
 #. / "Normalization" can also be called "synchronization"
 #: ../src/client/application/geary-args.vala:23
-#, fuzzy
 msgid "Log folder normalization"
-msgstr "Log folder normalization"
+msgstr "Журнал нормування тек"
 
 #: ../src/client/application/geary-args.vala:24
 msgid "Allow inspection of WebView"
@@ -219,192 +218,195 @@ msgstr "Дозволити ревізію WebView"
 msgid "Display program version"
 msgstr "Показати версію програми"
 
+#. 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"
+
+#: ../src/client/application/geary-args.vala:48
 msgid "Please report comments, suggestions and bugs to:"
-msgstr "Будь ласка, надсилайте зауваження, пропозиції та звіти про вади до нас:"
+msgstr ""
+"Будь ласка, надсилайте зауваження, пропозиції та звіти про вади до нас:"
 
 #. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:54
+#: ../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-args.vala:65
+#: ../src/client/application/geary-args.vala:66
 #, c-format
 msgid "Unrecognized command line option \"%s\"\n"
 msgstr "Невідомий параметр командного рядка «%s»\n"
 
-#: ../src/client/application/geary-controller.vala:44
+#: ../src/client/application/geary-controller.vala:46
 msgid "_Delete"
 msgstr "_Вилучити"
 
-#: ../src/client/application/geary-controller.vala:45
-#| msgid "%u conversations selected."
+#: ../src/client/application/geary-controller.vala:47
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Вилучити розмову (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:46
-#| msgid "%u conversations selected."
+#: ../src/client/application/geary-controller.vala:48
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Вилучити розмови (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:49
-#| msgid "Trash"
+#: ../src/client/application/geary-controller.vala:51
 msgid "_Trash"
 msgstr "_Смітник"
 
-#: ../src/client/application/geary-controller.vala:50
+#: ../src/client/application/geary-controller.vala:52
 msgid "Move conversation to trash (Delete, Backspace)"
 msgstr "Перенести розмову в смітник (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:51
-#| msgid "No conversations selected."
+#: ../src/client/application/geary-controller.vala:53
 msgid "Move conversations to trash (Delete, Backspace)"
 msgstr "Перенести розмови в смітник (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:54
+#: ../src/client/application/geary-controller.vala:56
 msgid "_Archive"
 msgstr "_Архівувати"
 
-#: ../src/client/application/geary-controller.vala:55
+#: ../src/client/application/geary-controller.vala:57
 msgid "Archive conversation (A)"
 msgstr "Архівувати розмову (А)"
 
-#: ../src/client/application/geary-controller.vala:56
+#: ../src/client/application/geary-controller.vala:58
 msgid "Archive conversations (A)"
 msgstr "Архівувати розмови (А)"
 
-#: ../src/client/application/geary-controller.vala:59
+#: ../src/client/application/geary-controller.vala:61
 msgid "Mark as S_pam"
 msgstr "Зазначити як _спам"
 
-#: ../src/client/application/geary-controller.vala:60
+#: ../src/client/application/geary-controller.vala:62
 msgid "Mark as not S_pam"
 msgstr "Зазначити не як _спам"
 
-#: ../src/client/application/geary-controller.vala:62
-#: ../src/client/application/geary-controller.vala:272
+#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:275
 msgid "Mark conversation"
 msgstr "Зазначити розмову"
 
-#: ../src/client/application/geary-controller.vala:63
+#: ../src/client/application/geary-controller.vala:65
 msgid "Mark conversations"
 msgstr "Зазначити розмови"
 
-#: ../src/client/application/geary-controller.vala:64
+#: ../src/client/application/geary-controller.vala:66
 msgid "Add label to conversation"
 msgstr "Додати мітку до розмови"
 
-#: ../src/client/application/geary-controller.vala:65
+#: ../src/client/application/geary-controller.vala:67
 msgid "Add label to conversations"
 msgstr "Додати мітку до розмов"
 
-#: ../src/client/application/geary-controller.vala:66
-#: ../src/client/application/geary-controller.vala:311
+#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:314
 msgid "Move conversation"
 msgstr "Перенести розмову"
 
-#: ../src/client/application/geary-controller.vala:67
+#: ../src/client/application/geary-controller.vala:69
 msgid "Move conversations"
 msgstr "Перенести розмови"
 
-#: ../src/client/application/geary-controller.vala:248
+#: ../src/client/application/geary-controller.vala:251
 msgid "A_ccounts"
 msgstr "_Облікові записи"
 
-#: ../src/client/application/geary-controller.vala:253
+#: ../src/client/application/geary-controller.vala:256
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "П_араметри"
 
-#: ../src/client/application/geary-controller.vala:257
+#: ../src/client/application/geary-controller.vala:260
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Довідка"
 
-#: ../src/client/application/geary-controller.vala:261
+#: ../src/client/application/geary-controller.vala:264
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Про програму"
 
-#: ../src/client/application/geary-controller.vala:265
+#: ../src/client/application/geary-controller.vala:268
 msgid "_Donate"
 msgstr "По_жертвувати"
 
-#: ../src/client/application/geary-controller.vala:269
+#: ../src/client/application/geary-controller.vala:272
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "Ви_йти"
 
-#: ../src/client/application/geary-controller.vala:274
+#: ../src/client/application/geary-controller.vala:277
 msgid "_Mark as..."
 msgstr "_Зазначити як…"
 
-#: ../src/client/application/geary-controller.vala:280
+#: ../src/client/application/geary-controller.vala:283
 msgid "Mark as _Read"
 msgstr "Зазначити як _прочитане"
 
-#: ../src/client/application/geary-controller.vala:286
+#: ../src/client/application/geary-controller.vala:289
 msgid "Mark as _Unread"
 msgstr "Зазначити як _непрочитане"
 
-#: ../src/client/application/geary-controller.vala:292
+#: ../src/client/application/geary-controller.vala:295
 msgid "_Star"
 msgstr "_Із зіркою"
 
-#: ../src/client/application/geary-controller.vala:297
+#: ../src/client/application/geary-controller.vala:300
 msgid "U_nstar"
 msgstr "_Без зірки"
 
-#: ../src/client/application/geary-controller.vala:307
+#: ../src/client/application/geary-controller.vala:310
 msgid "Add label"
 msgstr "Додати мітку"
 
-#: ../src/client/application/geary-controller.vala:308
+#: ../src/client/application/geary-controller.vala:311
 msgid "_Label"
 msgstr "_Мітка"
 
-#: ../src/client/application/geary-controller.vala:312
+#: ../src/client/application/geary-controller.vala:315
 msgid "_Move"
 msgstr "_Перенести"
 
-#: ../src/client/application/geary-controller.vala:316
+#: ../src/client/application/geary-controller.vala:319
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Скласти новий лист (Ctrl+N, N)"
 
 #. Reply to a message.
-#: ../src/client/application/geary-controller.vala:320
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1549
+#: ../src/client/application/geary-controller.vala:323
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1567
 msgid "_Reply"
 msgstr "_Відповісти"
 
-#: ../src/client/application/geary-controller.vala:321
+#: ../src/client/application/geary-controller.vala:324
 msgid "Reply (Ctrl+R, R)"
 msgstr "Відповісти (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:325
+#: ../src/client/application/geary-controller.vala:328
 msgid "R_eply All"
 msgstr "В_ідповісти всім"
 
-#: ../src/client/application/geary-controller.vala:326
+#: ../src/client/application/geary-controller.vala:329
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Відповісти всім (Ctrl+Shift+R, Shift+R)"
 
 #. Forward a message.
-#: ../src/client/application/geary-controller.vala:331
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1559
+#: ../src/client/application/geary-controller.vala:334
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1577
 msgid "_Forward"
-msgstr "_Перенадіслати"
+msgstr "_Переслати"
 
-#: ../src/client/application/geary-controller.vala:332
+#: ../src/client/application/geary-controller.vala:335
 msgid "Forward (Ctrl+L, F)"
-msgstr "Перенадіслати (Ctrl+L, F)"
+msgstr "Переслати (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:615
+#: ../src/client/application/geary-controller.vala:618
 msgid "Your settings are insecure"
 msgstr "Ваші параметри — незахищені"
 
-#: ../src/client/application/geary-controller.vala:616
+#: ../src/client/application/geary-controller.vala:619
 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 "
@@ -414,37 +416,52 @@ msgstr ""
 "Таким чином ваші пароль та  користувач можуть стати доступними для інших "
 "людей у мережі. Ви впевнені в своєму виборі?"
 
-#: ../src/client/application/geary-controller.vala:617
+#: ../src/client/application/geary-controller.vala:620
 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:689
-#: ../src/client/components/status-bar.vala:28
+#: ../src/client/application/geary-controller.vala:698
+#: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Помилка надсилання пошти"
 
-#: ../src/client/application/geary-controller.vala:690
+#: ../src/client/application/geary-controller.vala:699
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
 msgstr ""
-"Geary зіткнувася з помилкою надсилання пошти. Якщо проблема не зникає, "
+"Geary зіткнувся з помилкою надсилання пошти. Якщо проблема не зникає, "
 "вручну вилучіть пошту з теки «Вихідні»."
 
-#: ../src/client/application/geary-controller.vala:753
+#. 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/components/status-bar.vala:33
+msgid "Error saving sent mail"
+msgstr "Помилка збереження надісланої пошти"
+
+#: ../src/client/application/geary-controller.vala:704
+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 зіткнувся з помилкою збереження надісланої пошти. Лист залишиться в "
+"теці «Вихідні», поки ви його не вилучите."
+
+#: ../src/client/application/geary-controller.vala:773
 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:765
+#: ../src/client/application/geary-controller.vala:785
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Неможливо відкрити базу даних для %s"
 
-#: ../src/client/application/geary-controller.vala:766
+#: ../src/client/application/geary-controller.vala:786
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -466,23 +483,23 @@ msgstr ""
 "Geary може перезібрати базу даних і повторно синхронізувати через сервер або "
 "після виходу.\n"
 "\n"
-"Перезібрання бази даних знищить всю локальну пошту та її долучень. <b>На "
+"Перезбирання бази даних знищить всю локальну пошту та її долучень. <b>На "
 "пошту на вашому сервері це не поширюється.</b>"
 
-#: ../src/client/application/geary-controller.vala:768
+#: ../src/client/application/geary-controller.vala:788
 msgid "_Rebuild"
 msgstr "_Перебудувати"
 
-#: ../src/client/application/geary-controller.vala:768
+#: ../src/client/application/geary-controller.vala:788
 msgid "E_xit"
 msgstr "В_ийти"
 
-#: ../src/client/application/geary-controller.vala:777
+#: ../src/client/application/geary-controller.vala:797
 #, c-format
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Неможливо перезібрати базу даних для «%s»"
 
-#: ../src/client/application/geary-controller.vala:778
+#: ../src/client/application/geary-controller.vala:798
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -495,14 +512,14 @@ 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:800
-#: ../src/client/application/geary-controller.vala:810
-#: ../src/client/application/geary-controller.vala:821
+#: ../src/client/application/geary-controller.vala:820
+#: ../src/client/application/geary-controller.vala:830
+#: ../src/client/application/geary-controller.vala:841
 #, c-format
 msgid "Unable to open local mailbox for %s"
 msgstr "Неможливо відкрити локальну пошту для %s"
 
-#: ../src/client/application/geary-controller.vala:801
+#: ../src/client/application/geary-controller.vala:821
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -521,7 +538,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:811
+#: ../src/client/application/geary-controller.vala:831
 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 "
@@ -535,7 +552,7 @@ msgstr ""
 "\n"
 "Встановіть останню версію Geary та спробуйте ще раз."
 
-#: ../src/client/application/geary-controller.vala:822
+#: ../src/client/application/geary-controller.vala:842
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -547,23 +564,23 @@ msgstr ""
 "\n"
 "Перевірте мережевий зв'язок і перезапустіть Geary."
 
-#: ../src/client/application/geary-controller.vala:1292
+#: ../src/client/application/geary-controller.vala:1335
 #, c-format
 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:1295
+#: ../src/client/application/geary-controller.vala:1338
 msgid "translator-credits"
 msgstr "Daniel Korostil <ted korostiled gmail com>"
 
-#: ../src/client/application/geary-controller.vala:1552
+#: ../src/client/application/geary-controller.vala:1596
 #, c-format
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Відкрити «%s»?"
 
-#: ../src/client/application/geary-controller.vala:1553
+#: ../src/client/application/geary-controller.vala:1597
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -571,25 +588,36 @@ msgstr ""
 "Долучення можуть зашкодити вашій системі. Відкривайте файли лише з надійних "
 "джерел."
 
-#: ../src/client/application/geary-controller.vala:1554
+#: ../src/client/application/geary-controller.vala:1598
 msgid "Don't _ask me again"
 msgstr "Більше не _запитувати"
 
-#: ../src/client/application/geary-controller.vala:1572
+#: ../src/client/application/geary-controller.vala:1616
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Файл з назвою «%s» вже існує. Перезаписати його?"
 
-#: ../src/client/application/geary-controller.vala:1574
+#: ../src/client/application/geary-controller.vala:1618
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "У «%s» вже існує такий файл. Його вміст буде переписано при заміні."
 
-#: ../src/client/application/geary-controller.vala:1577
+#: ../src/client/application/geary-controller.vala:1621
 msgid "_Replace"
 msgstr "_Замінити"
 
+#: ../src/client/application/geary-controller.vala:1923
+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:1925
+msgid "Delete"
+msgstr "Вилучити"
+
 #: ../src/client/components/conversation-find-bar.vala:214
 #, c-format
 msgid "%i match"
@@ -634,7 +662,7 @@ 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:25
+#: ../src/client/components/status-bar.vala:26
 msgid "Sending..."
 msgstr "Надсилання…"
 
@@ -648,7 +676,7 @@ msgid "_Cancel"
 msgstr "_Скасувати"
 
 #: ../src/client/components/stock.vala:23 ../ui/account_list.glade.h:4
-#: ../ui/composer.glade.h:46 ../ui/preferences.glade.h:1
+#: ../ui/preferences.glade.h:1
 msgid "_Close"
 msgstr "_Закрити"
 
@@ -670,7 +698,7 @@ msgstr "В_илучити"
 
 #. Select all.
 #: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1018
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1035
 msgid "Select _All"
 msgstr "Вибрати _все"
 
@@ -695,208 +723,215 @@ msgid "Error saving"
 msgstr "Помилка зберігання"
 
 #. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
-#: ../src/client/composer/composer-window.vala:95
+#: ../src/client/composer/composer-window.vala:90
 msgid "attach|enclosed|enclosing|cover letter"
 msgstr "долуч|вклад|файл"
 
-#: ../src/client/composer/composer-window.vala:681
+#: ../src/client/composer/composer-window.vala:679
 msgid "Do you want to discard the unsaved message?"
 msgstr "Відкинути незбережений лист?"
 
-#: ../src/client/composer/composer-window.vala:684
+#: ../src/client/composer/composer-window.vala:682
 msgid "Do you want to discard this message?"
 msgstr "Відкинути цей лист?"
 
-#: ../src/client/composer/composer-window.vala:761
+#: ../src/client/composer/composer-window.vala:759
 msgid "Send message with an empty subject and body?"
 msgstr "Надіслати лист без теми і текстом листа?"
 
-#: ../src/client/composer/composer-window.vala:763
+#: ../src/client/composer/composer-window.vala:761
 msgid "Send message with an empty subject?"
 msgstr "Надіслати лист без теми?"
 
-#: ../src/client/composer/composer-window.vala:765
+#: ../src/client/composer/composer-window.vala:763
 msgid "Send message with an empty body?"
 msgstr "Надіслати лист без тексту?"
 
-#: ../src/client/composer/composer-window.vala:767
+#: ../src/client/composer/composer-window.vala:765
 msgid "Send message without an attachment?"
 msgstr "Надіслати лист без долучень?"
 
-#: ../src/client/composer/composer-window.vala:950
+#: ../src/client/composer/composer-window.vala:948
 msgid "Cannot add attachment"
 msgstr "Неможливо додати долучення"
 
-#: ../src/client/composer/composer-window.vala:961
+#: ../src/client/composer/composer-window.vala:959
 #, c-format
 msgid "\"%s\" could not be found."
 msgstr "«%s» неможливо знайти."
 
-#: ../src/client/composer/composer-window.vala:968
+#: ../src/client/composer/composer-window.vala:966
 #, c-format
 msgid "\"%s\" is a folder."
 msgstr "«%s» — тека."
 
-#: ../src/client/composer/composer-window.vala:975
+#: ../src/client/composer/composer-window.vala:973
 #, c-format
 msgid "\"%s\" is an empty file."
 msgstr "«%s» — порожній файл."
 
-#: ../src/client/composer/composer-window.vala:989
+#: ../src/client/composer/composer-window.vala:987
 #, c-format
 msgid "\"%s\" could not be opened for reading."
 msgstr "«%s» неможливо відкрити, щоб прочитати."
 
-#: ../src/client/composer/composer-window.vala:996
+#: ../src/client/composer/composer-window.vala:994
 #, c-format
 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-window.vala:1005
+#: ../src/client/composer/composer-window.vala:1003
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/client/composer/composer-window.vala:1267
+#: ../src/client/composer/composer-window.vala:1265
 msgid "Select Color"
 msgstr "Вибрати колір"
 
+#. 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:"
+msgstr "_Від:"
+
+#. 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/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Я"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:254
+#: ../src/client/conversation-viewer/conversation-viewer.vala:255
 msgid "No conversations selected."
 msgstr "Жодну розмову не вибрано."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:256
+#: ../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 розмову вибрано."
 msgstr[1] "%u розмови вибрано."
 msgstr[2] "%u розмов вибрано."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:285
+#: ../src/client/conversation-viewer/conversation-viewer.vala:286
 msgid "No search results found."
 msgstr "Не знайдено жодного результату."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:287
+#: ../src/client/conversation-viewer/conversation-viewer.vala:288
 msgid "No conversations in folder."
 msgstr "Немає розмов у теці."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:526
+#: ../src/client/conversation-viewer/conversation-viewer.vala:527
 msgid "This message contains remote images."
 msgstr "Цей лист містить віддалені зображення."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:526
+#: ../src/client/conversation-viewer/conversation-viewer.vala:527
 msgid "Show Images"
 msgstr "Показати зображення"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:527
+#: ../src/client/conversation-viewer/conversation-viewer.vala:528
 msgid "Always Show From Sender"
 msgstr "Завжди показувати від відправника"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:551
+#: ../src/client/conversation-viewer/conversation-viewer.vala:552
 msgid "Edit Draft"
 msgstr "Редагувати чернетку"
 
-#. Geary account mail will be sent from
-#: ../src/client/conversation-viewer/conversation-viewer.vala:623
-#: ../ui/composer.glade.h:41
-msgid "From:"
-msgstr "Від:"
-
-#. Address(es) e-mail is to be sent to
-#: ../src/client/conversation-viewer/conversation-viewer.vala:626
-#: ../ui/composer.glade.h:36
+#: ../src/client/conversation-viewer/conversation-viewer.vala:631
 msgid "To:"
 msgstr "Кому:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:629
-#: ../ui/composer.glade.h:37
+#: ../src/client/conversation-viewer/conversation-viewer.vala:634
 msgid "Cc:"
 msgstr "Копія:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:632
-#: ../ui/composer.glade.h:39
+#: ../src/client/conversation-viewer/conversation-viewer.vala:637
 msgid "Bcc:"
 msgstr "Потайна копія:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:635
-#: ../ui/composer.glade.h:38
+#: ../src/client/conversation-viewer/conversation-viewer.vala:640
 msgid "Subject:"
 msgstr "Тема:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:638
+#: ../src/client/conversation-viewer/conversation-viewer.vala:643
 msgid "Date:"
 msgstr "Дата:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:845
+#: ../src/client/conversation-viewer/conversation-viewer.vala:850
 #, c-format
-#| msgid "%d new message"
-#| msgid_plural "%d new messages"
 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:982
+#, 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:991
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1008
 #: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Копіювати"
 
 #. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:999
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1016
 msgid "Copy _Email Address"
 msgstr "Копіювати _поштову адресу"
 
 #. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1004
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1021
 #: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Копіювати _посилання"
 
 #. Select message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1012
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1029
 msgid "Select _Message"
 msgstr "Вибрати _лист"
 
 #. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1024
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1041
 msgid "_Inspect"
 msgstr "_Дослідити"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1249
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1267
 msgid "This link appears to go to"
 msgstr "Це посилання начебто веде"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1250
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1268
 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:1305
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1323
 msgid " (Invalid?)"
 msgstr " (Неправильно?)"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1497
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1515
 msgid "_Save As..."
 msgstr "_Зберегти як…"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1502
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1520
 msgid "Save All A_ttachments..."
 msgstr "Зберегти всі _долучення…"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1516
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1534
 msgid "_Save Image As..."
 msgstr "_Зберегти зображення як…"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1539
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
 msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] "Зберегти долучення…"
@@ -904,41 +939,41 @@ msgstr[1] "Зберегти долучення…"
 msgstr[2] "Зберегти всі долучення…"
 
 #. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1554
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1572
 msgid "Reply to _All"
 msgstr "Відповісти в_сім"
 
 #. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1571
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1589
 msgid "_Mark as Read"
 msgstr "_Зазначити як прочитане"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1575
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1593
 msgid "_Mark as Unread"
 msgstr "_Зазначити як непрочитане"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1581
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1599
 msgid "Mark Unread From _Here"
-msgstr ""
+msgstr "Зазначити непрочитаним _звідси"
 
 #. Separator.
 #. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1596
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1614
 msgid "_View Source"
 msgstr "_Глянути код"
 
 #. Generate the attachment table.
 #. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1901
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1908
 #: ../src/engine/rfc822/rfc822-utils.vala:327
 msgid "none"
 msgstr "немає"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2031
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2038
 msgid "Failed to open default text editor."
 msgstr "Не вдалося відкрити типовий текстовий редактор."
 
-#: ../src/client/conversation-viewer/conversation-web-view.vala:293
+#: ../src/client/conversation-viewer/conversation-web-view.vala:296
 #, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s — ревізор розмов"
@@ -955,7 +990,6 @@ msgstr "_Долучити"
 #. 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 "Уведіть ваш пароль"
 
@@ -1103,7 +1137,7 @@ msgstr[0] "%dхв тому"
 msgstr[1] "%dхв тому"
 msgstr[2] "%dхв тому"
 
-#: ../src/client/util/util-date.vala:170
+#: ../src/client/util/util-date.vala:171
 #, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
@@ -1111,19 +1145,19 @@ msgstr[0] "%dг тому"
 msgstr[1] "%dг тому"
 msgstr[2] "%dг тому"
 
-#: ../src/client/util/util-date.vala:177
+#: ../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:182
+#: ../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:734
+#: ../src/engine/rfc822/rfc822-message.vala:742
 msgid "(no subject)"
 msgstr "(без теми)"
 
@@ -1207,57 +1241,98 @@ msgstr "Вихідні"
 msgid "Archive"
 msgstr "Архів"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:24
+#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:25
 msgid "None"
 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:632
-#| msgid "Save A_ttachment..."
-#| msgid_plural "Save All A_ttachments..."
+#: ../src/engine/imap-db/imap-db-account.vala:662
 msgid "attachment"
 msgstr "долучення"
 
 #. / 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:635
+#. 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"
 
 #. / 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:638
+#: ../src/engine/imap-db/imap-db-account.vala:668
 msgid "body"
 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:641
-#| msgid "Bcc:"
+#: ../src/engine/imap-db/imap-db-account.vala:671
+#: ../src/engine/imap-db/imap-db-account.vala:684
 msgid "cc"
 msgstr "cc"
 
 #. / 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:644
+#: ../src/engine/imap-db/imap-db-account.vala:674
+#: ../src/engine/imap-db/imap-db-account.vala:684
 msgid "from"
 msgstr "from"
 
 #. / 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:647
-#| msgid "Subject:"
+#: ../src/engine/imap-db/imap-db-account.vala:677
 msgid "subject"
 msgstr "subject"
 
 #. / 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:650
+#: ../src/engine/imap-db/imap-db-account.vala:680
+#: ../src/engine/imap-db/imap-db-account.vala:684
 msgid "to"
 msgstr "to"
 
+#. "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 "Я"
+
+#. 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 | Draft"
+msgstr "Чернетки | Чернетка | Draft | Drafts"
+
+#. 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"
+
+#. 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
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
+"Спам | Непотріб | Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk "
+"Mail | Bulk Email | Bulk E-Mail"
+
+#. List of 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 "Сміття | Смітник | Кошик | TTrash | Rubbish | Rubbish Bin"
+
 #. / 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
@@ -1318,7 +1393,8 @@ msgstr "Копія: %s\n"
 #: ../ui/account_cannot_remove.glade.h:1
 msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Неможливо вилучити обліковий запис</span> "
+"<span weight=\"bold\" size=\"larger\">Неможливо вилучити обліковий запис</"
+"span> "
 
 #: ../ui/account_cannot_remove.glade.h:2
 msgid ""
@@ -1473,6 +1549,23 @@ msgstr "_Фіксованої ширини"
 msgid "Fixed Width"
 msgstr "Фіксована ширина"
 
+#. Address(es) e-mail is to be sent to
+#: ../ui/composer.glade.h:36
+msgid "_To:"
+msgstr "_Кому:"
+
+#: ../ui/composer.glade.h:37
+msgid "_Cc:"
+msgstr "Ко_пія:"
+
+#: ../ui/composer.glade.h:38
+msgid "_Subject:"
+msgstr "_Тема:"
+
+#: ../ui/composer.glade.h:39
+msgid "_Bcc:"
+msgstr "По_тайна копія:"
+
 #: ../ui/composer.glade.h:42
 msgid "Drop files here"
 msgstr "Перетягніть файли сюди"
@@ -1489,6 +1582,10 @@ msgstr "_Долучити файл"
 msgid "_Include Original Attachments"
 msgstr "_Вкласти початкові долучення"
 
+#: ../ui/composer.glade.h:46
+msgid "C_lose"
+msgstr "_Закрити"
+
 #: ../ui/composer.glade.h:47
 msgid "_Send"
 msgstr "_Надіслати"
@@ -1510,7 +1607,6 @@ msgid "_Case sensitive"
 msgstr "_Враховувати регістр"
 
 #: ../ui/find_bar.glade.h:5
-#| msgid "Labels"
 msgid "label"
 msgstr "мітка"
 
@@ -1543,82 +1639,90 @@ msgid "Work, Home, etc."
 msgstr "Робочий, домашній, тощо."
 
 #: ../ui/login.glade.h:9
+msgid "_Save sent mail"
+msgstr "З_берегти надіслану пошту"
+
+#: ../ui/login.glade.h:10
 msgid "IMAP settings"
 msgstr "Параметри IMAP"
 
-#: ../ui/login.glade.h:10
+#: ../ui/login.glade.h:11
 msgid "Se_rver:"
 msgstr "Се_рвер:"
 
-#: ../ui/login.glade.h:11
+#: ../ui/login.glade.h:12
 msgid "P_ort:"
 msgstr "Пор_т:"
 
-#: ../ui/login.glade.h:12
+#: ../ui/login.glade.h:13
 msgid "Ser_ver:"
 msgstr "Се_рвер:"
 
-#: ../ui/login.glade.h:13
+#: ../ui/login.glade.h:14
 msgid "Por_t:"
 msgstr "Пор_т:"
 
-#: ../ui/login.glade.h:14
+#: ../ui/login.glade.h:15
 msgid "SMTP settings"
 msgstr "Параметри SMTP"
 
-#: ../ui/login.glade.h:15
+#: ../ui/login.glade.h:16
 msgid "User_name:"
 msgstr "_Користувач:"
 
-#: ../ui/login.glade.h:16
+#: ../ui/login.glade.h:17
 msgid "Pass_word:"
 msgstr "Па_роль:"
 
-#: ../ui/login.glade.h:17
+#: ../ui/login.glade.h:18
 msgid "SMTP username"
 msgstr "Користувач SMTP"
 
-#: ../ui/login.glade.h:18
+#: ../ui/login.glade.h:19
 msgid "SMTP password"
 msgstr "Пароль SMTP"
 
-#: ../ui/login.glade.h:19
+#: ../ui/login.glade.h:20
 msgid "_Username:"
 msgstr "_Користувач:"
 
-#: ../ui/login.glade.h:20
+#: ../ui/login.glade.h:21
 msgid "IMAP username"
 msgstr "Користувач IMAP"
 
-#: ../ui/login.glade.h:21
+#: ../ui/login.glade.h:22
 msgid "IMAP password"
 msgstr "Пароль IMAP"
 
-#: ../ui/login.glade.h:22
+#: ../ui/login.glade.h:23
 msgid "Encr_yption:"
 msgstr "_Шифрування:"
 
-#: ../ui/login.glade.h:23
+#: ../ui/login.glade.h:24
 msgid "Encrypt_ion:"
 msgstr "_Шифрування:"
 
-#: ../ui/login.glade.h:25
+#: ../ui/login.glade.h:26
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
-#: ../ui/login.glade.h:26
+#: ../ui/login.glade.h:27
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: ../ui/login.glade.h:27
+#: ../ui/login.glade.h:28
 msgid "No authentication re_quired"
 msgstr "Не потрібно за_свідчення"
 
-#: ../ui/login.glade.h:28
+#: ../ui/login.glade.h:29
+msgid "Use IMAP cre_dentials"
+msgstr "Використовувати _реєстраційні дані IMAP"
+
+#: ../ui/login.glade.h:30
 msgid "Storage"
 msgstr "Пам'ять"
 
-#: ../ui/login.glade.h:29
+#: ../ui/login.glade.h:31
 msgid "_Download mail:"
 msgstr "_Звантажити пошту:"
 
@@ -1674,7 +1778,8 @@ msgstr "Показувати _сповіщення про нову пошту"
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
 "account?</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">Вилучити цей обліковий запис?</span> "
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Вилучити цей обліковий запис?</span> "
 
 #: ../ui/remove_confirm.glade.h:2
 msgid ""
@@ -1696,9 +1801,6 @@ msgstr "Електрона адреса:"
 msgid "Geary upgrade in progress."
 msgstr "Оновлення Geary."
 
-#~ msgid "IMAP Credentials"
-#~ msgstr "IMAP Credentials"
-
 #~ msgid "Port:"
 #~ msgstr "Порт:"