[geary] Updated Ukrainian translation

[Daniel Korostil <dankor src gnome org>]

commit f6b47920a8f9cd97abf361a220d3d1e47f6c43ae
Author: Daniel Korostil <ted korostiled gmail com>
Date:   Sat Aug 30 01:06:37 2014 +0300

    Updated Ukrainian translation

 po/uk.po |  693 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 437 insertions(+), 256 deletions(-)
---
diff --git a/po/uk.po b/po/uk.po
index c4d5b51..2ebe8ae 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\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"
+"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"
 "Language-Team: linux.org.ua\n"
 "Language: uk\n"
@@ -24,24 +24,24 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../desktop/geary.desktop.in.h:1
+#: ../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.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.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
 msgid "Geary Mail"
 msgstr "Пошта Geary"
 
-#: ../desktop/geary.desktop.in.h:4
+#: ../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.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
 msgid "Email;E-mail;Mail;"
 msgstr "Пошта;Лист;"
 
@@ -75,89 +75,89 @@ msgstr "Облікові записи"
 msgid "First Last"
 msgstr "Повне ім'я"
 
-#: ../src/client/accounts/add-edit-page.vala:202
+#: ../src/client/accounts/add-edit-page.vala:228
 msgid "Welcome to Geary."
 msgstr "Ласкаво просимо до Geary."
 
-#: ../src/client/accounts/add-edit-page.vala:202
+#: ../src/client/accounts/add-edit-page.vala:228
 msgid "Enter your account information to get started."
 msgstr "Введіть інформацію про ваш обліковий запис."
 
-#: ../src/client/accounts/add-edit-page.vala:223
+#: ../src/client/accounts/add-edit-page.vala:247
 msgid "2 weeks back"
 msgstr "2 тижні тому"
 
 #. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:224
+#: ../src/client/accounts/add-edit-page.vala:248
 msgid "1 month back"
 msgstr "1 місяць тому"
 
-#: ../src/client/accounts/add-edit-page.vala:225
+#: ../src/client/accounts/add-edit-page.vala:249
 msgid "3 months back"
 msgstr "3 місяці тому"
 
-#: ../src/client/accounts/add-edit-page.vala:226
+#: ../src/client/accounts/add-edit-page.vala:250
 msgid "6 months back"
 msgstr "6 місяців тому"
 
-#: ../src/client/accounts/add-edit-page.vala:227
+#: ../src/client/accounts/add-edit-page.vala:251
 msgid "1 year back"
 msgstr "1 рік тому"
 
-#: ../src/client/accounts/add-edit-page.vala:228
+#: ../src/client/accounts/add-edit-page.vala:252
 msgid "2 years back"
 msgstr "2 роки тому"
 
-#: ../src/client/accounts/add-edit-page.vala:229
+#: ../src/client/accounts/add-edit-page.vala:253
 msgid "4 years back"
 msgstr "4 роки тому"
 
 #. Separator
-#: ../src/client/accounts/add-edit-page.vala:231
+#: ../src/client/accounts/add-edit-page.vala:255
 msgid "Everything"
 msgstr "Загалом"
 
-#: ../src/client/accounts/add-edit-page.vala:630
+#: ../src/client/accounts/add-edit-page.vala:686
 msgid "Remem_ber passwords"
 msgstr "Запа_м'ятати паролі"
 
-#: ../src/client/accounts/add-edit-page.vala:637 ../ui/login.glade.h:6
+#: ../src/client/accounts/add-edit-page.vala:693 ../ui/login.glade.h:6
 msgid "Remem_ber password"
 msgstr "Запа_м'ятати пароль"
 
-#: ../src/client/accounts/add-edit-page.vala:671
+#: ../src/client/accounts/add-edit-page.vala:727
 msgid "Unable to validate:\n"
 msgstr "Неможливо підтвердити:\n"
 
-#: ../src/client/accounts/add-edit-page.vala:673
+#: ../src/client/accounts/add-edit-page.vala:729
 msgid "        &#8226; Invalid account nickname.\n"
 msgstr "        &#8226; Неправильний псевдонім облікового запису.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:676
+#: ../src/client/accounts/add-edit-page.vala:732
 msgid "        &#8226; Email address already added to Geary.\n"
 msgstr "        &#8226; Електрону адресу вже додано до Geary.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:680
+#: ../src/client/accounts/add-edit-page.vala:736
 msgid "        &#8226; IMAP connection error.\n"
 msgstr "        &#8226; Помилка з'єднання IMAP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:683
+#: ../src/client/accounts/add-edit-page.vala:739
 msgid "        &#8226; IMAP username or password incorrect.\n"
 msgstr "        &#8226; Неправильний користувач або пароль IMAP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:686
+#: ../src/client/accounts/add-edit-page.vala:742
 msgid "        &#8226; SMTP connection error.\n"
 msgstr "        &#8226; Помилка з'єднання SMTP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:689
+#: ../src/client/accounts/add-edit-page.vala:745
 msgid "        &#8226; SMTP username or password incorrect.\n"
 msgstr "        &#8226; Неправильний користувач або пароль SMTP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:693
+#: ../src/client/accounts/add-edit-page.vala:749
 msgid "        &#8226; Connection error.\n"
 msgstr "        &#8226; Помилка з'єднання.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:697
+#: ../src/client/accounts/add-edit-page.vala:753
 msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Неправильний користувач або пароль.\n"
 
@@ -170,243 +170,257 @@ msgid "Visit the Yorba web site"
 msgstr "Відвідати сайт Yorba"
 
 #: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Запустити Geary зі схованим головним вікном"
+
+#: ../src/client/application/geary-args.vala:11
 msgid "Output debugging information"
 msgstr "Виводити зневаджувальну інформацію"
 
-#: ../src/client/application/geary-args.vala:11
+#: ../src/client/application/geary-args.vala:12
 msgid "Log conversation monitoring"
 msgstr "Журнал спостереження за розмовами"
 
-#: ../src/client/application/geary-args.vala:12
+#: ../src/client/application/geary-args.vala:13
 msgid "Log network deserialization"
 msgstr "Журнал мережевої десеріалізації"
 
-#: ../src/client/application/geary-args.vala:13
+#: ../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/application/geary-args.vala:16
+#: ../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/application/geary-args.vala:19
+#: ../src/client/application/geary-args.vala:20
 msgid "Log network serialization"
 msgstr "Журнал мережевої серіалізації"
 
-#: ../src/client/application/geary-args.vala:20
+#: ../src/client/application/geary-args.vala:21
 msgid "Log periodic activity"
 msgstr "Журнал періодичної діяльності"
 
-#: ../src/client/application/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/application/geary-args.vala:23
+#: ../src/client/application/geary-args.vala:24
 msgid "Log folder normalization"
 msgstr "Журнал нормування тек"
 
-#: ../src/client/application/geary-args.vala:24
+#: ../src/client/application/geary-args.vala:25
 msgid "Allow inspection of WebView"
 msgstr "Дозволити ревізію WebView"
 
-#: ../src/client/application/geary-args.vala:25
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Відкликати всі серверні сертифікати із зауваженнями щодо TLS"
+
+#: ../src/client/application/geary-args.vala:27
 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
+#: ../src/client/application/geary-args.vala:51
 #, c-format
 msgid "Use %s to open a new composer window"
 msgstr "Щоб відкрити нове вікно редактора, введіть %s"
 
-#: ../src/client/application/geary-args.vala:48
+#: ../src/client/application/geary-args.vala:52
 msgid "Please report comments, suggestions and bugs to:"
 msgstr ""
 "Будь ласка, надсилайте зауваження, пропозиції та звіти про вади до нас:"
 
 #. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:55
+#: ../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:66
+#: ../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:46
+#: ../src/client/application/geary-controller.vala:56
 msgid "_Delete"
 msgstr "_Вилучити"
 
-#: ../src/client/application/geary-controller.vala:47
+#: ../src/client/application/geary-controller.vala:57
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Вилучити розмову (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:48
+#: ../src/client/application/geary-controller.vala:58
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Вилучити розмови (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:51
+#. 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:52
+#: ../src/client/application/geary-controller.vala:63
 msgid "Move conversation to trash (Delete, Backspace)"
 msgstr "Перенести розмову в смітник (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:53
+#: ../src/client/application/geary-controller.vala:64
 msgid "Move conversations to trash (Delete, Backspace)"
 msgstr "Перенести розмови в смітник (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:56
+#. This refers to the action ("archive an email"), not the Archive folder itself
+#: ../src/client/application/geary-controller.vala:68
 msgid "_Archive"
 msgstr "_Архівувати"
 
-#: ../src/client/application/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:69
 msgid "Archive conversation (A)"
 msgstr "Архівувати розмову (А)"
 
-#: ../src/client/application/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:70
 msgid "Archive conversations (A)"
 msgstr "Архівувати розмови (А)"
 
-#: ../src/client/application/geary-controller.vala:61
+#: ../src/client/application/geary-controller.vala:73
 msgid "Mark as S_pam"
 msgstr "Зазначити як _спам"
 
-#: ../src/client/application/geary-controller.vala:62
+#: ../src/client/application/geary-controller.vala:74
 msgid "Mark as not S_pam"
 msgstr "Зазначити не як _спам"
 
-#: ../src/client/application/geary-controller.vala:64
-#: ../src/client/application/geary-controller.vala:275
+#: ../src/client/application/geary-controller.vala:76
+#: ../src/client/application/geary-controller.vala:295
 msgid "Mark conversation"
 msgstr "Зазначити розмову"
 
-#: ../src/client/application/geary-controller.vala:65
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark conversations"
 msgstr "Зазначити розмови"
 
-#: ../src/client/application/geary-controller.vala:66
+#: ../src/client/application/geary-controller.vala:78
 msgid "Add label to conversation"
 msgstr "Додати мітку до розмови"
 
-#: ../src/client/application/geary-controller.vala:67
+#: ../src/client/application/geary-controller.vala:79
 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:80
+#: ../src/client/application/geary-controller.vala:334
 msgid "Move conversation"
 msgstr "Перенести розмову"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:81
 msgid "Move conversations"
 msgstr "Перенести розмови"
 
-#: ../src/client/application/geary-controller.vala:251
+#: ../src/client/application/geary-controller.vala:271
 msgid "A_ccounts"
 msgstr "_Облікові записи"
 
-#: ../src/client/application/geary-controller.vala:256
+#: ../src/client/application/geary-controller.vala:276
 #: ../src/client/components/stock.vala:27
 msgid "_Preferences"
 msgstr "П_араметри"
 
-#: ../src/client/application/geary-controller.vala:260
+#: ../src/client/application/geary-controller.vala:280
 #: ../src/client/components/stock.vala:25
 msgid "_Help"
 msgstr "_Довідка"
 
-#: ../src/client/application/geary-controller.vala:264
+#: ../src/client/application/geary-controller.vala:284
 #: ../src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_Про програму"
 
-#: ../src/client/application/geary-controller.vala:268
+#: ../src/client/application/geary-controller.vala:288
 msgid "_Donate"
 msgstr "По_жертвувати"
 
-#: ../src/client/application/geary-controller.vala:272
+#: ../src/client/application/geary-controller.vala:292
 #: ../src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "Ви_йти"
 
-#: ../src/client/application/geary-controller.vala:277
+#: ../src/client/application/geary-controller.vala:297
 msgid "_Mark as..."
 msgstr "_Зазначити як…"
 
-#: ../src/client/application/geary-controller.vala:283
+#: ../src/client/application/geary-controller.vala:303
 msgid "Mark as _Read"
 msgstr "Зазначити як _прочитане"
 
-#: ../src/client/application/geary-controller.vala:289
+#: ../src/client/application/geary-controller.vala:309
 msgid "Mark as _Unread"
 msgstr "Зазначити як _непрочитане"
 
-#: ../src/client/application/geary-controller.vala:295
+#: ../src/client/application/geary-controller.vala:315
 msgid "_Star"
 msgstr "_Із зіркою"
 
-#: ../src/client/application/geary-controller.vala:300
+#: ../src/client/application/geary-controller.vala:320
 msgid "U_nstar"
 msgstr "_Без зірки"
 
-#: ../src/client/application/geary-controller.vala:310
+#: ../src/client/application/geary-controller.vala:330
 msgid "Add label"
 msgstr "Додати мітку"
 
-#: ../src/client/application/geary-controller.vala:311
+#: ../src/client/application/geary-controller.vala:331
 msgid "_Label"
 msgstr "_Мітка"
 
-#: ../src/client/application/geary-controller.vala:315
+#: ../src/client/application/geary-controller.vala:335
 msgid "_Move"
 msgstr "_Перенести"
 
-#: ../src/client/application/geary-controller.vala:319
+#: ../src/client/application/geary-controller.vala:339
 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:343
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1579
 msgid "_Reply"
 msgstr "_Відповісти"
 
-#: ../src/client/application/geary-controller.vala:324
+#: ../src/client/application/geary-controller.vala:344
 msgid "Reply (Ctrl+R, R)"
 msgstr "Відповісти (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:328
+#: ../src/client/application/geary-controller.vala:348
 msgid "R_eply All"
 msgstr "В_ідповісти всім"
 
-#: ../src/client/application/geary-controller.vala:329
+#: ../src/client/application/geary-controller.vala:349
 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:354
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1589
 msgid "_Forward"
 msgstr "_Переслати"
 
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:355
 msgid "Forward (Ctrl+L, F)"
 msgstr "Переслати (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:618
+#: ../src/client/application/geary-controller.vala:623
+msgid "Unable to store server trust exception"
+msgstr "Неможливо зберегти виняток довіри до сервера"
+
+#: ../src/client/application/geary-controller.vala:860
 msgid "Your settings are insecure"
 msgstr "Ваші параметри — незахищені"
 
-#: ../src/client/application/geary-controller.vala:619
+#: ../src/client/application/geary-controller.vala:861
 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 "
@@ -416,32 +430,32 @@ msgstr ""
 "Таким чином ваші пароль та  користувач можуть стати доступними для інших "
 "людей у мережі. Ви впевнені в своєму виборі?"
 
-#: ../src/client/application/geary-controller.vala:620
+#: ../src/client/application/geary-controller.vala:862
 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:698
+#: ../src/client/application/geary-controller.vala:940
 #: ../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:941
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
 msgstr ""
-"Geary зіткнувся з помилкою надсилання пошти. Якщо проблема не зникає, "
-"вручну вилучіть пошту з теки «Вихідні»."
+"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:945
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Помилка збереження надісланої пошти"
 
-#: ../src/client/application/geary-controller.vala:704
+#: ../src/client/application/geary-controller.vala:946
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -449,19 +463,19 @@ msgstr ""
 "Geary зіткнувся з помилкою збереження надісланої пошти. Лист залишиться в "
 "теці «Вихідні», поки ви його не вилучите."
 
-#: ../src/client/application/geary-controller.vala:773
+#: ../src/client/application/geary-controller.vala:1015
 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
+#: ../src/client/application/geary-controller.vala:1027
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Неможливо відкрити базу даних для %s"
 
-#: ../src/client/application/geary-controller.vala:786
+#: ../src/client/application/geary-controller.vala:1028
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -486,20 +500,20 @@ msgstr ""
 "Перезбирання бази даних знищить всю локальну пошту та її долучень. <b>На "
 "пошту на вашому сервері це не поширюється.</b>"
 
-#: ../src/client/application/geary-controller.vala:788
+#: ../src/client/application/geary-controller.vala:1030
 msgid "_Rebuild"
 msgstr "_Перебудувати"
 
-#: ../src/client/application/geary-controller.vala:788
+#: ../src/client/application/geary-controller.vala:1030
 msgid "E_xit"
 msgstr "В_ийти"
 
-#: ../src/client/application/geary-controller.vala:797
+#: ../src/client/application/geary-controller.vala:1039
 #, c-format
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Неможливо перезібрати базу даних для «%s»"
 
-#: ../src/client/application/geary-controller.vala:798
+#: ../src/client/application/geary-controller.vala:1040
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -512,14 +526,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:820
-#: ../src/client/application/geary-controller.vala:830
-#: ../src/client/application/geary-controller.vala:841
+#: ../src/client/application/geary-controller.vala:1062
+#: ../src/client/application/geary-controller.vala:1072
+#: ../src/client/application/geary-controller.vala:1083
 #, c-format
 msgid "Unable to open local mailbox for %s"
 msgstr "Неможливо відкрити локальну пошту для %s"
 
-#: ../src/client/application/geary-controller.vala:821
+#: ../src/client/application/geary-controller.vala:1063
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -538,7 +552,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:831
+#: ../src/client/application/geary-controller.vala:1073
 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 "
@@ -552,7 +566,7 @@ msgstr ""
 "\n"
 "Встановіть останню версію Geary та спробуйте ще раз."
 
-#: ../src/client/application/geary-controller.vala:842
+#: ../src/client/application/geary-controller.vala:1084
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -564,23 +578,23 @@ msgstr ""
 "\n"
 "Перевірте мережевий зв'язок і перезапустіть Geary."
 
-#: ../src/client/application/geary-controller.vala:1335
+#: ../src/client/application/geary-controller.vala:1591
 #, 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:1338
+#: ../src/client/application/geary-controller.vala:1594
 msgid "translator-credits"
 msgstr "Daniel Korostil <ted korostiled gmail com>"
 
-#: ../src/client/application/geary-controller.vala:1596
+#: ../src/client/application/geary-controller.vala:1858
 #, c-format
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Відкрити «%s»?"
 
-#: ../src/client/application/geary-controller.vala:1597
+#: ../src/client/application/geary-controller.vala:1859
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -588,33 +602,39 @@ msgstr ""
 "Долучення можуть зашкодити вашій системі. Відкривайте файли лише з надійних "
 "джерел."
 
-#: ../src/client/application/geary-controller.vala:1598
+#: ../src/client/application/geary-controller.vala:1860
 msgid "Don't _ask me again"
 msgstr "Більше не _запитувати"
 
-#: ../src/client/application/geary-controller.vala:1616
+#: ../src/client/application/geary-controller.vala:1878
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Файл з назвою «%s» вже існує. Перезаписати його?"
 
-#: ../src/client/application/geary-controller.vala:1618
+#: ../src/client/application/geary-controller.vala:1880
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "У «%s» вже існує такий файл. Його вміст буде переписано при заміні."
 
-#: ../src/client/application/geary-controller.vala:1621
+#: ../src/client/application/geary-controller.vala:1883
 msgid "_Replace"
 msgstr "_Замінити"
 
-#: ../src/client/application/geary-controller.vala:1923
+#. 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
+msgid "Close open draft messages?"
+msgstr "Закрити відкриту чернетку листа?"
+
+#: ../src/client/application/geary-controller.vala:2259
 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
+#: ../src/client/application/geary-controller.vala:2261
 msgid "Delete"
 msgstr "Вилучити"
 
@@ -644,23 +664,27 @@ msgstr "не знайдено"
 msgid "Search"
 msgstr "Пошук"
 
-#. Spacer.
 #. Search bar.
-#: ../src/client/components/main-toolbar.vala:84
+#: ../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:205
+#: ../src/client/components/main-toolbar.vala:212
 #, c-format
 msgid "Indexing %s account"
 msgstr "Індексування облікового запису %s"
 
-#: ../src/client/components/main-toolbar.vala:212
+#: ../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..."
@@ -676,7 +700,7 @@ msgid "_Cancel"
 msgstr "_Скасувати"
 
 #: ../src/client/components/stock.vala:23 ../ui/account_list.glade.h:4
-#: ../ui/preferences.glade.h:1
+#: ../ui/preferences.glade.h:2
 msgid "_Close"
 msgstr "_Закрити"
 
@@ -698,7 +722,7 @@ msgstr "В_илучити"
 
 #. Select all.
 #: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1035
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1047
 msgid "Select _All"
 msgstr "Вибрати _все"
 
@@ -706,115 +730,132 @@ msgstr "Вибрати _все"
 msgid "_Keep"
 msgstr "_Зберегти"
 
-#: ../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "Створити лист"
-
-#: ../src/client/composer/composer-window.vala:41
+#: ../src/client/composer/composer-widget.vala:57
 msgid "Saved"
 msgstr "Збережено"
 
-#: ../src/client/composer/composer-window.vala:42
+#: ../src/client/composer/composer-widget.vala:58
 msgid "Saving"
 msgstr "Зберігання"
 
-#: ../src/client/composer/composer-window.vala:43
+#: ../src/client/composer/composer-widget.vala:59
 msgid "Error saving"
 msgstr "Помилка зберігання"
 
 #. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
-#: ../src/client/composer/composer-window.vala:90
+#: ../src/client/composer/composer-widget.vala:106
 msgid "attach|enclosed|enclosing|cover letter"
 msgstr "долуч|вклад|файл"
 
-#: ../src/client/composer/composer-window.vala:679
+#: ../src/client/composer/composer-widget.vala:823
 msgid "Do you want to discard the unsaved message?"
 msgstr "Відкинути незбережений лист?"
 
-#: ../src/client/composer/composer-window.vala:682
+#: ../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/composer/composer-window.vala:759
+#: ../src/client/composer/composer-widget.vala:911
 msgid "Send message with an empty subject and body?"
 msgstr "Надіслати лист без теми і текстом листа?"
 
-#: ../src/client/composer/composer-window.vala:761
+#: ../src/client/composer/composer-widget.vala:913
 msgid "Send message with an empty subject?"
 msgstr "Надіслати лист без теми?"
 
-#: ../src/client/composer/composer-window.vala:763
+#: ../src/client/composer/composer-widget.vala:915
 msgid "Send message with an empty body?"
 msgstr "Надіслати лист без тексту?"
 
-#: ../src/client/composer/composer-window.vala:765
+#: ../src/client/composer/composer-widget.vala:917
 msgid "Send message without an attachment?"
 msgstr "Надіслати лист без долучень?"
 
-#: ../src/client/composer/composer-window.vala:948
+#: ../src/client/composer/composer-widget.vala:1100
 msgid "Cannot add attachment"
 msgstr "Неможливо додати долучення"
 
-#: ../src/client/composer/composer-window.vala:959
+#: ../src/client/composer/composer-widget.vala:1111
 #, c-format
 msgid "\"%s\" could not be found."
 msgstr "«%s» неможливо знайти."
 
-#: ../src/client/composer/composer-window.vala:966
+#: ../src/client/composer/composer-widget.vala:1118
 #, c-format
 msgid "\"%s\" is a folder."
 msgstr "«%s» — тека."
 
-#: ../src/client/composer/composer-window.vala:973
+#: ../src/client/composer/composer-widget.vala:1125
 #, c-format
 msgid "\"%s\" is an empty file."
 msgstr "«%s» — порожній файл."
 
-#: ../src/client/composer/composer-window.vala:987
+#: ../src/client/composer/composer-widget.vala:1139
 #, c-format
 msgid "\"%s\" could not be opened for reading."
 msgstr "«%s» неможливо відкрити, щоб прочитати."
 
-#: ../src/client/composer/composer-window.vala:994
+#: ../src/client/composer/composer-widget.vala:1146
 #, 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:1003
+#: ../src/client/composer/composer-widget.vala:1155
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/client/composer/composer-window.vala:1265
+#: ../src/client/composer/composer-widget.vala:1215
+msgid "To: "
+msgstr "Кому: "
+
+#: ../src/client/composer/composer-widget.vala:1218
+msgid "Cc: "
+msgstr "Копія: "
+
+#: ../src/client/composer/composer-widget.vala:1221
+msgid "Bcc: "
+msgstr "Потайна копія: "
+
+#: ../src/client/composer/composer-widget.vala:1438
 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
+#: ../src/client/composer/composer-widget.vala:1884
 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
+#: ../src/client/composer/composer-widget.vala:1900
+#: ../src/client/conversation-viewer/conversation-viewer.vala:637
 msgid "From:"
 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.
+#.
+#. Window for sending messages.
+#: ../src/client/composer/composer-window.vala:10
+msgid "New Message"
+msgstr "Створити лист"
+
 #: ../src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "Я"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:255
+#: ../src/client/conversation-viewer/conversation-viewer.vala:262
 msgid "No conversations selected."
 msgstr "Жодну розмову не вибрано."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:257
+#: ../src/client/conversation-viewer/conversation-viewer.vala:264
 #, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
@@ -822,51 +863,51 @@ msgstr[0] "%u розмову вибрано."
 msgstr[1] "%u розмови вибрано."
 msgstr[2] "%u розмов вибрано."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:286
+#: ../src/client/conversation-viewer/conversation-viewer.vala:293
 msgid "No search results found."
 msgstr "Не знайдено жодного результату."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:288
+#: ../src/client/conversation-viewer/conversation-viewer.vala:295
 msgid "No conversations in folder."
 msgstr "Немає розмов у теці."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:527
+#: ../src/client/conversation-viewer/conversation-viewer.vala:536
 msgid "This message contains remote images."
 msgstr "Цей лист містить віддалені зображення."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:527
+#: ../src/client/conversation-viewer/conversation-viewer.vala:536
 msgid "Show Images"
 msgstr "Показати зображення"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:528
+#: ../src/client/conversation-viewer/conversation-viewer.vala:537
 msgid "Always Show From Sender"
 msgstr "Завжди показувати від відправника"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:552
+#: ../src/client/conversation-viewer/conversation-viewer.vala:561
 msgid "Edit Draft"
 msgstr "Редагувати чернетку"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:631
+#: ../src/client/conversation-viewer/conversation-viewer.vala:640
 msgid "To:"
 msgstr "Кому:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:634
+#: ../src/client/conversation-viewer/conversation-viewer.vala:643
 msgid "Cc:"
 msgstr "Копія:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:637
+#: ../src/client/conversation-viewer/conversation-viewer.vala:646
 msgid "Bcc:"
 msgstr "Потайна копія:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:640
+#: ../src/client/conversation-viewer/conversation-viewer.vala:649
 msgid "Subject:"
 msgstr "Тема:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:643
+#: ../src/client/conversation-viewer/conversation-viewer.vala:652
 msgid "Date:"
 msgstr "Дата:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:850
+#: ../src/client/conversation-viewer/conversation-viewer.vala:862
 #, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
@@ -874,64 +915,64 @@ msgstr[0] "%u прочитаний лист"
 msgstr[1] "%u прочитаних листів"
 msgstr[2] "%u прочитаних листів"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:982
+#: ../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:1008
+#: ../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:1016
+#: ../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:1021
+#: ../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:1029
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1041
 msgid "Select _Message"
 msgstr "Вибрати _лист"
 
 #. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1041
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1053
 msgid "_Inspect"
 msgstr "_Дослідити"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1267
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1279
 msgid "This link appears to go to"
 msgstr "Це посилання начебто веде"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1268
+#: ../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:1323
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1335
 msgid " (Invalid?)"
 msgstr " (Неправильно?)"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1515
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1527
 msgid "_Save As..."
 msgstr "_Зберегти як…"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1520
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1532
 msgid "Save All A_ttachments..."
 msgstr "Зберегти всі _долучення…"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1534
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1546
 msgid "_Save Image As..."
 msgstr "_Зберегти зображення як…"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1569
 msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] "Зберегти долучення…"
@@ -939,41 +980,41 @@ msgstr[1] "Зберегти долучення…"
 msgstr[2] "Зберегти всі долучення…"
 
 #. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1572
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1584
 msgid "Reply to _All"
 msgstr "Відповісти в_сім"
 
 #. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1589
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1601
 msgid "_Mark as Read"
 msgstr "_Зазначити як прочитане"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1593
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1605
 msgid "_Mark as Unread"
 msgstr "_Зазначити як непрочитане"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1599
+#: ../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:1614
+#: ../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:1908
+#: ../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:2038
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2070
 msgid "Failed to open default text editor."
 msgstr "Не вдалося відкрити типовий текстовий редактор."
 
-#: ../src/client/conversation-viewer/conversation-web-view.vala:296
+#: ../src/client/conversation-viewer/conversation-web-view.vala:321
 #, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s — ревізор розмов"
@@ -986,6 +1027,86 @@ msgstr "Виберіть файл"
 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 неможливо завірити."
+
+#: ../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/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+"Вибравши «Не довіряти цьому серверу» спричинитись утрату доступу до цього "
+"сервера."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Geary не додаватиме і не оновлятиме цей поштовий обліковий запис."
+
+#: ../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/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
+"Geary вимкнеться, якщо ви не маєте інших відкритих поштових облікових "
+"записів."
+
+#: ../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/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+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/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Серверний сертифікат вичерпано"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+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/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 "Виникла помилка під час оброблення серверного сертифікату"
+
 #. 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
@@ -994,7 +1115,7 @@ msgid "Please enter your password"
 msgstr "Уведіть ваш пароль"
 
 #. Label displaying total number of email messages in a folder
-#: ../src/client/folder-list/folder-list-folder-entry.vala:30
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
 #, c-format
 msgid "%d message"
 msgid_plural "%d messages"
@@ -1003,7 +1124,7 @@ 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:37
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
@@ -1014,7 +1135,7 @@ 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:43
+#: ../src/client/folder-list/folder-list-folder-entry.vala:45
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
@@ -1157,7 +1278,7 @@ msgid "%A"
 msgstr "%A"
 
 #: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:742
+#: ../src/engine/rfc822/rfc822-message.vala:741
 msgid "(no subject)"
 msgstr "(без теми)"
 
@@ -1185,6 +1306,14 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "КБ"
 
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
+
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
+
 #: ../src/engine/api/geary-service-provider.vala:52
 msgid "Gmail"
 msgstr "Gmail"
@@ -1302,14 +1431,14 @@ 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
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:535
 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
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:540
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 "Надіслано | Надіслане | Надіслана пошта | Надісланий лист | Sent | Sent Mail "
@@ -1318,7 +1447,7 @@ msgstr ""
 #. 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/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"
@@ -1329,7 +1458,7 @@ 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:536
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:550
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Сміття | Смітник | Кошик | TTrash | Rubbish | Rubbish Bin"
 
@@ -1420,6 +1549,22 @@ msgstr "Вилучити обліковий запис"
 msgid "Please wait while Geary validates your account."
 msgstr "Зачекайте поки перевіряється ваш обліковий запис."
 
+#: ../ui/certificate_warning_dialog.glade.h:1
+msgid "Untrusted Connection"
+msgstr "Надійне з'єднання"
+
+#: ../ui/certificate_warning_dialog.glade.h:2
+msgid "_Always Trust This Server"
+msgstr "_Завжди довіряти цьому серверу"
+
+#: ../ui/certificate_warning_dialog.glade.h:3
+msgid "_Trust This Server"
+msgstr "_Довіритись цьому серверу"
+
+#: ../ui/certificate_warning_dialog.glade.h:4
+msgid "_Don't Trust This Server"
+msgstr "_Не довіряти цьому серверу"
+
 #: ../ui/composer.glade.h:1
 msgid "_Undo"
 msgstr "_Повернути"
@@ -1549,46 +1694,63 @@ msgstr "_Фіксованої ширини"
 msgid "Fixed Width"
 msgstr "Фіксована ширина"
 
-#. Address(es) e-mail is to be sent to
+#: ../ui/composer.glade.h:35
+msgid "Detach"
+msgstr "Викинути"
+
 #: ../ui/composer.glade.h:36
-msgid "_To:"
-msgstr "_Кому:"
+msgid "_Send"
+msgstr "_Надіслати"
 
 #: ../ui/composer.glade.h:37
-msgid "_Cc:"
-msgstr "Ко_пія:"
+msgid "Send"
+msgstr "Надіслати"
 
 #: ../ui/composer.glade.h:38
-msgid "_Subject:"
-msgstr "_Тема:"
+msgid "_Attach File"
+msgstr "_Долучити файл"
 
 #: ../ui/composer.glade.h:39
-msgid "_Bcc:"
-msgstr "По_тайна копія:"
+msgid "Attach File"
+msgstr "Долучити файл"
 
-#: ../ui/composer.glade.h:42
-msgid "Drop files here"
-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 add them as attachments"
-msgstr "Щоб додати їх як долучення"
+msgid "_To"
+msgstr "_Кому"
 
 #: ../ui/composer.glade.h:44
-msgid "_Attach File"
-msgstr "_Долучити файл"
+msgid "_Cc"
+msgstr "Ко_пія"
 
 #: ../ui/composer.glade.h:45
-msgid "_Include Original Attachments"
-msgstr "_Вкласти початкові долучення"
+msgid "_Subject"
+msgstr "_Тема"
 
 #: ../ui/composer.glade.h:46
-msgid "C_lose"
-msgstr "_Закрити"
+msgid "_Bcc"
+msgstr "По_тайна копія"
 
-#: ../ui/composer.glade.h:47
-msgid "_Send"
-msgstr "_Надіслати"
+#. Geary account mail will be sent from
+#: ../ui/composer.glade.h:48
+msgid "From"
+msgstr "Від"
+
+#: ../ui/composer.glade.h:49
+msgid "Drop files here"
+msgstr "Перетягніть файли сюди"
+
+#: ../ui/composer.glade.h:50
+msgid "To add them as attachments"
+msgstr "Щоб додати їх як долучення"
 
 #: ../ui/find_bar.glade.h:1
 msgid "Find:"
@@ -1615,24 +1777,24 @@ msgid "Password"
 msgstr "Пароль"
 
 #: ../ui/login.glade.h:2
-msgid "E_mail address:"
-msgstr "_Електрона адреса:"
+msgid "E_mail address"
+msgstr "_Електрона адреса"
 
 #: ../ui/login.glade.h:3
-msgid "_Password:"
-msgstr "_Пароль:"
+msgid "_Password"
+msgstr "_Пароль"
 
 #: ../ui/login.glade.h:4
-msgid "S_ervice:"
-msgstr "_Служба:"
+msgid "S_ervice"
+msgstr "_Служба"
 
 #: ../ui/login.glade.h:5
-msgid "N_ame:"
-msgstr "_Користувач:"
+msgid "N_ame"
+msgstr "_Ім'я"
 
 #: ../ui/login.glade.h:7
-msgid "N_ickname:"
-msgstr "_Псевдонім:"
+msgid "N_ickname"
+msgstr "_Псевдонім"
 
 #: ../ui/login.glade.h:8
 msgid "Work, Home, etc."
@@ -1647,32 +1809,32 @@ msgid "IMAP settings"
 msgstr "Параметри IMAP"
 
 #: ../ui/login.glade.h:11
-msgid "Se_rver:"
-msgstr "Се_рвер:"
+msgid "Se_rver"
+msgstr "Се_рвер"
 
 #: ../ui/login.glade.h:12
-msgid "P_ort:"
-msgstr "Пор_т:"
+msgid "P_ort"
+msgstr "Пор_т"
 
 #: ../ui/login.glade.h:13
-msgid "Ser_ver:"
-msgstr "Се_рвер:"
+msgid "Ser_ver"
+msgstr "Се_рвер"
 
 #: ../ui/login.glade.h:14
-msgid "Por_t:"
-msgstr "Пор_т:"
+msgid "Por_t"
+msgstr "Пор_т"
 
 #: ../ui/login.glade.h:15
 msgid "SMTP settings"
 msgstr "Параметри SMTP"
 
 #: ../ui/login.glade.h:16
-msgid "User_name:"
-msgstr "_Користувач:"
+msgid "User_name"
+msgstr "_Користувач"
 
 #: ../ui/login.glade.h:17
-msgid "Pass_word:"
-msgstr "Па_роль:"
+msgid "Pass_word"
+msgstr "Па_роль"
 
 #: ../ui/login.glade.h:18
 msgid "SMTP username"
@@ -1683,8 +1845,8 @@ msgid "SMTP password"
 msgstr "Пароль SMTP"
 
 #: ../ui/login.glade.h:20
-msgid "_Username:"
-msgstr "_Користувач:"
+msgid "_Username"
+msgstr "_Користувач"
 
 #: ../ui/login.glade.h:21
 msgid "IMAP username"
@@ -1695,12 +1857,12 @@ msgid "IMAP password"
 msgstr "Пароль IMAP"
 
 #: ../ui/login.glade.h:23
-msgid "Encr_yption:"
-msgstr "_Шифрування:"
+msgid "Encr_yption"
+msgstr "_Шифрування"
 
 #: ../ui/login.glade.h:24
-msgid "Encrypt_ion:"
-msgstr "_Шифрування:"
+msgid "Encrypt_ion"
+msgstr "_Шифрування"
 
 #: ../ui/login.glade.h:26
 msgid "SSL/TLS"
@@ -1723,8 +1885,20 @@ msgid "Storage"
 msgstr "Пам'ять"
 
 #: ../ui/login.glade.h:31
-msgid "_Download mail:"
-msgstr "_Звантажити пошту:"
+msgid "_Download mail"
+msgstr "_Звантажити пошту"
+
+#: ../ui/login.glade.h:32 ../ui/preferences.glade.h:6
+msgid "Composer"
+msgstr "Редактор"
+
+#: ../ui/login.glade.h:33
+msgid "Save dra_fts on server"
+msgstr "Зберігати _черевики на сервері"
+
+#: ../ui/login.glade.h:34
+msgid "Si_gn emails:"
+msgstr "_Підписати пошту:"
 
 #: ../ui/password-dialog.glade.h:1
 msgid "SMTP Credentials"
@@ -1742,38 +1916,42 @@ msgstr "Пароль:"
 msgid "_Remember password"
 msgstr "_Запам'ятати пароль"
 
-#: ../ui/preferences.glade.h:2
+#: ../ui/preferences.glade.h:1
+msgid "Preferences"
+msgstr "Параметри"
+
+#: ../ui/preferences.glade.h:3
 msgid "Reading"
 msgstr "Читання"
 
-#: ../ui/preferences.glade.h:3
+#: ../ui/preferences.glade.h:4
 msgid "_Automatically select next message"
 msgstr "_Автоматично вибирати наступний лист"
 
-#: ../ui/preferences.glade.h:4
+#: ../ui/preferences.glade.h:5
 msgid "_Display conversation preview"
 msgstr "_Показувати попередній огляд розмови"
 
-#: ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "Редактор"
-
-#: ../ui/preferences.glade.h:6
+#: ../ui/preferences.glade.h:7
 msgid "Enable _spell checking"
 msgstr "Перевіряти _орфографію"
 
-#: ../ui/preferences.glade.h:7
+#: ../ui/preferences.glade.h:8
 msgid "Notifications"
 msgstr "Сповіщення"
 
-#: ../ui/preferences.glade.h:8
+#: ../ui/preferences.glade.h:9
 msgid "_Play notification sounds"
 msgstr "Про_гравати звукові сповіщення "
 
-#: ../ui/preferences.glade.h:9
+#: ../ui/preferences.glade.h:10
 msgid "Show _notifications for new mail"
 msgstr "Показувати _сповіщення про нову пошту"
 
+#: ../ui/preferences.glade.h:11
+msgid "Notify of new mail at start_up"
+msgstr "Сповіщати про нову пошту під час _запуску"
+
 #: ../ui/remove_confirm.glade.h:1
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
@@ -1801,6 +1979,9 @@ msgstr "Електрона адреса:"
 msgid "Geary upgrade in progress."
 msgstr "Оновлення Geary."
 
+#~ msgid "C_lose"
+#~ msgstr "_Закрити"
+
 #~ msgid "Port:"
 #~ msgstr "Порт:"