[geary] Updated Ukrainian translation

From: Daniel Korostil <dankor src gnome org>
To: commits-list gnome org
Cc:
Subject: [geary] Updated Ukrainian translation
Date: Wed, 1 Jun 2016 20:45:11 +0000 (UTC)
commit 9a38a18eddf760b5a258dc63cba0b70a52af114f
Author: Daniel Korostil <ted korostiled gmail com>
Date:   Wed Jun 1 23:45:00 2016 +0300

    Updated Ukrainian translation

 po/uk.po |  942 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 594 insertions(+), 348 deletions(-)
---
diff --git a/po/uk.po b/po/uk.po
index 81d3f88..fb7de98 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,13 +6,14 @@
 # kosivantsov <kos ivantsov gmail com>, 2012
 # furyruf <ruffian ua gmail com>, 2013
 # sp4rr0w <sasha anpilov gmail com>, 2012
-# Daniel Korostil <ted korostiled gmail com>, 2014.
+# Daniel Korostil <ted korostiled gmail com>, 2014, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-30 00:37+0300\n"
-"PO-Revision-Date: 2014-08-30 01:05+0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=geary&k";
+"eywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-05-21 02:50+0000\n"
+"PO-Revision-Date: 2016-06-01 23:42+0300\n"
 "Last-Translator: Daniel Korostil <ted korostiled gmail com>\n"
 "Language-Team: linux.org.ua\n"
 "Language: uk\n"
@@ -49,22 +50,37 @@ msgstr "Пошта;Лист;"
 msgid "Compose Message"
 msgstr "Скласти лист"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
+#: ../desktop/geary-attach.contract.in.h:1
+#| msgid "Send and receive email"
+msgid "Send by email"
+msgstr "Надіслати поштою"
+
+#: ../desktop/geary-attach.contract.in.h:2
+msgid "Send files using Geary"
+msgstr "Надіслати файли через Geary"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
 #: ../src/client/components/stock.vala:31
 msgid "_Save"
 msgstr "З_берегти"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:48
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
 #: ../src/client/components/stock.vala:22
 msgid "_Add"
 msgstr "_Додати"
 
+#. reset/clear widgets
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+#, c-format
+msgid "Additional addresses for %s"
+msgstr "Додаткові адреси для %s"
+
 #. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:19
+#: ../src/client/accounts/account-dialog.vala:21
 msgid "Accounts"
 msgstr "Облікові записи"
 
-#. Copyright 2011-2014 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -75,99 +91,109 @@ msgstr "Облікові записи"
 msgid "First Last"
 msgstr "Повне ім'я"
 
-#: ../src/client/accounts/add-edit-page.vala:228
+#: ../src/client/accounts/add-edit-page.vala:233
 msgid "Welcome to Geary."
 msgstr "Ласкаво просимо до Geary."
 
-#: ../src/client/accounts/add-edit-page.vala:228
+#: ../src/client/accounts/add-edit-page.vala:233
 msgid "Enter your account information to get started."
 msgstr "Введіть інформацію про ваш обліковий запис."
 
-#: ../src/client/accounts/add-edit-page.vala:247
+#: ../src/client/accounts/add-edit-page.vala:253
 msgid "2 weeks back"
 msgstr "2 тижні тому"
 
 #. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:248
+#: ../src/client/accounts/add-edit-page.vala:254
 msgid "1 month back"
 msgstr "1 місяць тому"
 
-#: ../src/client/accounts/add-edit-page.vala:249
+#: ../src/client/accounts/add-edit-page.vala:255
 msgid "3 months back"
 msgstr "3 місяці тому"
 
-#: ../src/client/accounts/add-edit-page.vala:250
+#: ../src/client/accounts/add-edit-page.vala:256
 msgid "6 months back"
 msgstr "6 місяців тому"
 
-#: ../src/client/accounts/add-edit-page.vala:251
+#: ../src/client/accounts/add-edit-page.vala:257
 msgid "1 year back"
 msgstr "1 рік тому"
 
-#: ../src/client/accounts/add-edit-page.vala:252
+#: ../src/client/accounts/add-edit-page.vala:258
 msgid "2 years back"
 msgstr "2 роки тому"
 
-#: ../src/client/accounts/add-edit-page.vala:253
+#: ../src/client/accounts/add-edit-page.vala:259
 msgid "4 years back"
 msgstr "4 роки тому"
 
 #. Separator
-#: ../src/client/accounts/add-edit-page.vala:255
+#: ../src/client/accounts/add-edit-page.vala:261
 msgid "Everything"
 msgstr "Загалом"
 
-#: ../src/client/accounts/add-edit-page.vala:686
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "Редагувати"
+
+#: ../src/client/accounts/add-edit-page.vala:282
+#| msgid "_Previous"
+msgid "Preview"
+msgstr "Переглянути"
+
+#: ../src/client/accounts/add-edit-page.vala:723
 msgid "Remem_ber passwords"
 msgstr "Запа_м'ятати паролі"
 
-#: ../src/client/accounts/add-edit-page.vala:693 ../ui/login.glade.h:6
+#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
 msgid "Remem_ber password"
 msgstr "Запа_м'ятати пароль"
 
-#: ../src/client/accounts/add-edit-page.vala:727
+#: ../src/client/accounts/add-edit-page.vala:764
 msgid "Unable to validate:\n"
 msgstr "Неможливо підтвердити:\n"
 
-#: ../src/client/accounts/add-edit-page.vala:729
+#: ../src/client/accounts/add-edit-page.vala:766
 msgid "        &#8226; Invalid account nickname.\n"
 msgstr "        &#8226; Неправильний псевдонім облікового запису.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:732
+#: ../src/client/accounts/add-edit-page.vala:769
 msgid "        &#8226; Email address already added to Geary.\n"
 msgstr "        &#8226; Електрону адресу вже додано до Geary.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:736
+#: ../src/client/accounts/add-edit-page.vala:773
 msgid "        &#8226; IMAP connection error.\n"
 msgstr "        &#8226; Помилка з'єднання IMAP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:739
+#: ../src/client/accounts/add-edit-page.vala:776
 msgid "        &#8226; IMAP username or password incorrect.\n"
 msgstr "        &#8226; Неправильний користувач або пароль IMAP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:742
+#: ../src/client/accounts/add-edit-page.vala:779
 msgid "        &#8226; SMTP connection error.\n"
 msgstr "        &#8226; Помилка з'єднання SMTP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:745
+#: ../src/client/accounts/add-edit-page.vala:782
 msgid "        &#8226; SMTP username or password incorrect.\n"
 msgstr "        &#8226; Неправильний користувач або пароль SMTP.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:749
+#: ../src/client/accounts/add-edit-page.vala:786
 msgid "        &#8226; Connection error.\n"
 msgstr "        &#8226; Помилка з'єднання.\n"
 
-#: ../src/client/accounts/add-edit-page.vala:753
+#: ../src/client/accounts/add-edit-page.vala:790
 msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Неправильний користувач або пароль.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2014 Yorba Foundation"
-msgstr "© 2011-2014 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "© 2016 Software Freedom Conservancy Inc."
 
 #: ../src/client/application/geary-application.vala:21
-msgid "Visit the Yorba web site"
-msgstr "Відвідати сайт Yorba"
+#| msgid "Visit the Yorba web site"
+msgid "Visit the Geary web site"
+msgstr "Відвідати сайт Geary"
 
 #: ../src/client/application/geary-args.vala:10
 msgid "Start Geary with hidden main window"
@@ -248,179 +274,196 @@ msgstr "Не вдалося розібрати параметри командн
 msgid "Unrecognized command line option \"%s\"\n"
 msgstr "Невідомий параметр командного рядка «%s»\n"
 
-#: ../src/client/application/geary-controller.vala:56
-msgid "_Delete"
-msgstr "_Вилучити"
+#: ../src/client/application/geary-controller.vala:61
+#| msgid "Move conversation"
+msgid "Delete conversation"
+msgstr "Вилучити розмову"
 
-#: ../src/client/application/geary-controller.vala:57
+#: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
 msgstr "Вилучити розмову (Shift+Delete)"
 
-#: ../src/client/application/geary-controller.vala:58
+#: ../src/client/application/geary-controller.vala:63
 msgid "Delete conversations (Shift+Delete)"
 msgstr "Вилучити розмови (Shift+Delete)"
 
 #. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:62
-msgid "_Trash"
-msgstr "_Смітник"
+#: ../src/client/application/geary-controller.vala:67
+#| msgid "Move conversation to trash (Delete, Backspace)"
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr "Перенести розмову у смітник (Delete, Backspace)"
 
-#: ../src/client/application/geary-controller.vala:63
-msgid "Move conversation to trash (Delete, Backspace)"
-msgstr "Перенести розмову в смітник (Delete, Backspace)"
-
-#: ../src/client/application/geary-controller.vala:64
-msgid "Move conversations to trash (Delete, Backspace)"
-msgstr "Перенести розмови в смітник (Delete, Backspace)"
+#: ../src/client/application/geary-controller.vala:68
+#| msgid "Move conversations to trash (Delete, Backspace)"
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr "Перенести розмови у смітник (Delete, Backspace)"
 
 #. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:68
+#: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
 msgstr "_Архівувати"
 
-#: ../src/client/application/geary-controller.vala:69
+#: ../src/client/application/geary-controller.vala:73
 msgid "Archive conversation (A)"
 msgstr "Архівувати розмову (А)"
 
-#: ../src/client/application/geary-controller.vala:70
+#: ../src/client/application/geary-controller.vala:74
 msgid "Archive conversations (A)"
 msgstr "Архівувати розмови (А)"
 
-#: ../src/client/application/geary-controller.vala:73
+#: ../src/client/application/geary-controller.vala:77
 msgid "Mark as S_pam"
 msgstr "Зазначити як _спам"
 
-#: ../src/client/application/geary-controller.vala:74
+#: ../src/client/application/geary-controller.vala:78
 msgid "Mark as not S_pam"
 msgstr "Зазначити не як _спам"
 
-#: ../src/client/application/geary-controller.vala:76
-#: ../src/client/application/geary-controller.vala:295
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:394
 msgid "Mark conversation"
 msgstr "Зазначити розмову"
 
-#: ../src/client/application/geary-controller.vala:77
+#: ../src/client/application/geary-controller.vala:81
 msgid "Mark conversations"
 msgstr "Зазначити розмови"
 
-#: ../src/client/application/geary-controller.vala:78
+#: ../src/client/application/geary-controller.vala:82
 msgid "Add label to conversation"
 msgstr "Додати мітку до розмови"
 
-#: ../src/client/application/geary-controller.vala:79
+#: ../src/client/application/geary-controller.vala:83
 msgid "Add label to conversations"
 msgstr "Додати мітку до розмов"
 
-#: ../src/client/application/geary-controller.vala:80
-#: ../src/client/application/geary-controller.vala:334
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:433
 msgid "Move conversation"
 msgstr "Перенести розмову"
 
-#: ../src/client/application/geary-controller.vala:81
+#: ../src/client/application/geary-controller.vala:85
 msgid "Move conversations"
 msgstr "Перенести розмови"
 
-#: ../src/client/application/geary-controller.vala:271
+#: ../src/client/application/geary-controller.vala:374
+#: ../ui/app_menu.interface.h:1
 msgid "A_ccounts"
 msgstr "_Облікові записи"
 
-#: ../src/client/application/geary-controller.vala:276
-#: ../src/client/components/stock.vala:27
+#: ../src/client/application/geary-controller.vala:379
+#: ../src/client/components/stock.vala:27 ../ui/app_menu.interface.h:2
 msgid "_Preferences"
 msgstr "П_араметри"
 
-#: ../src/client/application/geary-controller.vala:280
-#: ../src/client/components/stock.vala:25
+#: ../src/client/application/geary-controller.vala:383
+#: ../src/client/components/stock.vala:25 ../ui/app_menu.interface.h:3
 msgid "_Help"
 msgstr "_Довідка"
 
-#: ../src/client/application/geary-controller.vala:284
-#: ../src/client/components/stock.vala:21
+#: ../src/client/application/geary-controller.vala:387
+#: ../src/client/components/stock.vala:21 ../ui/app_menu.interface.h:4
 msgid "_About"
 msgstr "_Про програму"
 
-#: ../src/client/application/geary-controller.vala:288
-msgid "_Donate"
-msgstr "По_жертвувати"
-
-#: ../src/client/application/geary-controller.vala:292
-#: ../src/client/components/stock.vala:29
+#: ../src/client/application/geary-controller.vala:391
+#: ../src/client/components/stock.vala:29 ../ui/app_menu.interface.h:5
 msgid "_Quit"
 msgstr "Ви_йти"
 
-#: ../src/client/application/geary-controller.vala:297
+#: ../src/client/application/geary-controller.vala:396
 msgid "_Mark as..."
 msgstr "_Зазначити як…"
 
-#: ../src/client/application/geary-controller.vala:303
+#: ../src/client/application/geary-controller.vala:402
 msgid "Mark as _Read"
 msgstr "Зазначити як _прочитане"
 
-#: ../src/client/application/geary-controller.vala:309
+#: ../src/client/application/geary-controller.vala:408
 msgid "Mark as _Unread"
 msgstr "Зазначити як _непрочитане"
 
-#: ../src/client/application/geary-controller.vala:315
+#: ../src/client/application/geary-controller.vala:414
 msgid "_Star"
 msgstr "_Із зіркою"
 
-#: ../src/client/application/geary-controller.vala:320
+#: ../src/client/application/geary-controller.vala:419
 msgid "U_nstar"
 msgstr "_Без зірки"
 
-#: ../src/client/application/geary-controller.vala:330
+#: ../src/client/application/geary-controller.vala:429
 msgid "Add label"
 msgstr "Додати мітку"
 
-#: ../src/client/application/geary-controller.vala:331
+#: ../src/client/application/geary-controller.vala:430
 msgid "_Label"
 msgstr "_Мітка"
 
-#: ../src/client/application/geary-controller.vala:335
+#: ../src/client/application/geary-controller.vala:434
 msgid "_Move"
 msgstr "_Перенести"
 
-#: ../src/client/application/geary-controller.vala:339
+#: ../src/client/application/geary-controller.vala:438
 msgid "Compose new message (Ctrl+N, N)"
 msgstr "Скласти новий лист (Ctrl+N, N)"
 
 #. Reply to a message.
-#: ../src/client/application/geary-controller.vala:343
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1579
+#: ../src/client/application/geary-controller.vala:442
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1875
 msgid "_Reply"
 msgstr "_Відповісти"
 
-#: ../src/client/application/geary-controller.vala:344
+#: ../src/client/application/geary-controller.vala:443
 msgid "Reply (Ctrl+R, R)"
 msgstr "Відповісти (Ctrl+R, R)"
 
-#: ../src/client/application/geary-controller.vala:348
+#: ../src/client/application/geary-controller.vala:447
 msgid "R_eply All"
 msgstr "В_ідповісти всім"
 
-#: ../src/client/application/geary-controller.vala:349
+#: ../src/client/application/geary-controller.vala:448
 msgid "Reply all (Ctrl+Shift+R, Shift+R)"
 msgstr "Відповісти всім (Ctrl+Shift+R, Shift+R)"
 
 #. Forward a message.
-#: ../src/client/application/geary-controller.vala:354
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1589
+#: ../src/client/application/geary-controller.vala:453
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1885
 msgid "_Forward"
 msgstr "_Переслати"
 
-#: ../src/client/application/geary-controller.vala:355
+#: ../src/client/application/geary-controller.vala:454
 msgid "Forward (Ctrl+L, F)"
 msgstr "Переслати (Ctrl+L, F)"
 
-#: ../src/client/application/geary-controller.vala:623
+#: ../src/client/application/geary-controller.vala:493
+msgid "Empty"
+msgstr "Спорожнити"
+
+#: ../src/client/application/geary-controller.vala:494
+msgid "Empty Spam or Trash folders"
+msgstr "Спорожнити спам і теку смітника"
+
+#: ../src/client/application/geary-controller.vala:498
+msgid "Empty _Spam…"
+msgstr "Спорожнити _спам…"
+
+#: ../src/client/application/geary-controller.vala:502
+msgid "Empty _Trash…"
+msgstr "Спорожнити _смітник…"
+
+#. No callback is connected, since we bind the toggle button to the search bar visibility
+#: ../src/client/application/geary-controller.vala:535
+msgid "Toggle search bar"
+msgstr "Перемкнути панель пошуку"
+
+#: ../src/client/application/geary-controller.vala:734
 msgid "Unable to store server trust exception"
 msgstr "Неможливо зберегти виняток довіри до сервера"
 
-#: ../src/client/application/geary-controller.vala:860
+#: ../src/client/application/geary-controller.vala:971
 msgid "Your settings are insecure"
 msgstr "Ваші параметри — незахищені"
 
-#: ../src/client/application/geary-controller.vala:861
+#: ../src/client/application/geary-controller.vala:972
 msgid ""
 "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
 "username and password could be read by another person on the network.  Are "
@@ -430,17 +473,17 @@ msgstr ""
 "Таким чином ваші пароль та  користувач можуть стати доступними для інших "
 "людей у мережі. Ви впевнені в своєму виборі?"
 
-#: ../src/client/application/geary-controller.vala:862
+#: ../src/client/application/geary-controller.vala:973
 msgid "Co_ntinue"
 msgstr "Про_довжити"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:940
+#: ../src/client/application/geary-controller.vala:1051
 #: ../src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Помилка надсилання пошти"
 
-#: ../src/client/application/geary-controller.vala:941
+#: ../src/client/application/geary-controller.vala:1052
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -450,12 +493,12 @@ msgstr ""
 
 #. Displayed in the space-limited status bar when a message fails to be uploaded
 #. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:945
+#: ../src/client/application/geary-controller.vala:1056
 #: ../src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Помилка збереження надісланої пошти"
 
-#: ../src/client/application/geary-controller.vala:946
+#: ../src/client/application/geary-controller.vala:1057
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -463,19 +506,19 @@ msgstr ""
 "Geary зіткнувся з помилкою збереження надісланої пошти. Лист залишиться в "
 "теці «Вихідні», поки ви його не вилучите."
 
-#: ../src/client/application/geary-controller.vala:1015
+#: ../src/client/application/geary-controller.vala:1126
 msgid "Labels"
 msgstr "Мітки"
 
 #. give the user two options: reset the Account local store, or exit Geary.  A third
 #. could be done to leave the Account in an unopened state, but we don't currently
 #. have provisions for that.
-#: ../src/client/application/geary-controller.vala:1027
+#: ../src/client/application/geary-controller.vala:1138
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Неможливо відкрити базу даних для %s"
 
-#: ../src/client/application/geary-controller.vala:1028
+#: ../src/client/application/geary-controller.vala:1139
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -500,20 +543,20 @@ msgstr ""
 "Перезбирання бази даних знищить всю локальну пошту та її долучень. <b>На "
 "пошту на вашому сервері це не поширюється.</b>"
 
-#: ../src/client/application/geary-controller.vala:1030
+#: ../src/client/application/geary-controller.vala:1141
 msgid "_Rebuild"
 msgstr "_Перебудувати"
 
-#: ../src/client/application/geary-controller.vala:1030
+#: ../src/client/application/geary-controller.vala:1141
 msgid "E_xit"
 msgstr "В_ийти"
 
-#: ../src/client/application/geary-controller.vala:1039
+#: ../src/client/application/geary-controller.vala:1150
 #, c-format
 msgid "Unable to rebuild database for \"%s\""
 msgstr "Неможливо перезібрати базу даних для «%s»"
 
-#: ../src/client/application/geary-controller.vala:1040
+#: ../src/client/application/geary-controller.vala:1151
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -526,14 +569,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:1062
-#: ../src/client/application/geary-controller.vala:1072
-#: ../src/client/application/geary-controller.vala:1083
+#: ../src/client/application/geary-controller.vala:1173
+#: ../src/client/application/geary-controller.vala:1183
+#: ../src/client/application/geary-controller.vala:1194
 #, c-format
 msgid "Unable to open local mailbox for %s"
 msgstr "Неможливо відкрити локальну пошту для %s"
 
-#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/application/geary-controller.vala:1174
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -552,7 +595,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/client/application/geary-controller.vala:1073
+#: ../src/client/application/geary-controller.vala:1184
 msgid ""
 "The version number of the local mail database is formatted for a newer "
 "version of Geary. Unfortunately, the database cannot be \"rolled back\" to "
@@ -566,7 +609,7 @@ msgstr ""
 "\n"
 "Встановіть останню версію Geary та спробуйте ще раз."
 
-#: ../src/client/application/geary-controller.vala:1084
+#: ../src/client/application/geary-controller.vala:1195
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -578,23 +621,28 @@ msgstr ""
 "\n"
 "Перевірте мережевий зв'язок і перезапустіть Geary."
 
-#: ../src/client/application/geary-controller.vala:1591
+#: ../src/client/application/geary-controller.vala:1706
 #, 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:1594
+#: ../src/client/application/geary-controller.vala:1709
 msgid "translator-credits"
 msgstr "Daniel Korostil <ted korostiled gmail com>"
 
-#: ../src/client/application/geary-controller.vala:1858
+#: ../src/client/application/geary-controller.vala:1967
+#| msgid "Underline (Ctrl+U)"
+msgid "Undo move (Ctrl+Z)"
+msgstr "Повернути рух (Ctrl+Z)"
+
+#: ../src/client/application/geary-controller.vala:1977
 #, c-format
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Відкрити «%s»?"
 
-#: ../src/client/application/geary-controller.vala:1859
+#: ../src/client/application/geary-controller.vala:1978
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -602,42 +650,82 @@ msgstr ""
 "Долучення можуть зашкодити вашій системі. Відкривайте файли лише з надійних "
 "джерел."
 
-#: ../src/client/application/geary-controller.vala:1860
+#: ../src/client/application/geary-controller.vala:1979
 msgid "Don't _ask me again"
 msgstr "Більше не _запитувати"
 
-#: ../src/client/application/geary-controller.vala:1878
+#: ../src/client/application/geary-controller.vala:1997
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Файл з назвою «%s» вже існує. Перезаписати його?"
 
-#: ../src/client/application/geary-controller.vala:1880
+#: ../src/client/application/geary-controller.vala:1999
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "У «%s» вже існує такий файл. Його вміст буде переписано при заміні."
 
-#: ../src/client/application/geary-controller.vala:1883
+#: ../src/client/application/geary-controller.vala:2002
 msgid "_Replace"
 msgstr "_Замінити"
 
 #. Find out what to do with the inline composers.
 #. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2150
+#: ../src/client/application/geary-controller.vala:2300
 msgid "Close open draft messages?"
 msgstr "Закрити відкриту чернетку листа?"
 
-#: ../src/client/application/geary-controller.vala:2259
+#: ../src/client/application/geary-controller.vala:2430
+#, c-format
+msgid "Empty all email from your %s folder?"
+msgstr "Спорожнити всі листи з теки %s?"
+
+#: ../src/client/application/geary-controller.vala:2431
+msgid "This removes the email from Geary and your email server."
+msgstr "Це вилучить всі листи з Geary і з вашого сервера."
+
+#: ../src/client/application/geary-controller.vala:2432
+#| msgid "\"%s\" could not be found."
+msgid "This cannot be undone."
+msgstr "Це неможливо повернути."
+
+#: ../src/client/application/geary-controller.vala:2433
+#, c-format
+msgid "Empty %s"
+msgstr "Спорожнити %s"
+
+#: ../src/client/application/geary-controller.vala:2450
+#, c-format
+#| msgid "Error saving"
+msgid "Error emptying %s"
+msgstr "Помилка спорожнення %s"
+
+#: ../src/client/application/geary-controller.vala:2480
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Остаточно вилучити цей лист?"
 msgstr[1] "Остаточно вилучити ці листи?"
 msgstr[2] "Остаточно вилучити ці листи?"
 
-#: ../src/client/application/geary-controller.vala:2261
+#: ../src/client/application/geary-controller.vala:2482
 msgid "Delete"
 msgstr "Вилучити"
 
+#: ../src/client/application/geary-controller.vala:2513
+#| msgid "Underline (Ctrl+U)"
+msgid "Undo archive (Ctrl+Z)"
+msgstr "Повернути архів (Ctrl+Z)"
+
+#: ../src/client/application/geary-controller.vala:2528
+#| msgid "Unquote text (Ctrl+[)"
+msgid "Undo trash (Ctrl+Z)"
+msgstr "Повернути смітник (Ctrl+Z)"
+
+#: ../src/client/application/geary-controller.vala:2581
+#| msgid "Underline (Ctrl+U)"
+msgid "Undo (Ctrl+Z)"
+msgstr "Повернути (Ctrl+Z)"
+
 #: ../src/client/components/conversation-find-bar.vala:214
 #, c-format
 msgid "%i match"
@@ -658,49 +746,48 @@ msgstr[2] "%i збігів (обгорнуто)"
 msgid "not found"
 msgstr "не знайдено"
 
-#: ../src/client/components/main-toolbar.vala:11
+#: ../src/client/components/main-window.vala:397
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: ../src/client/components/search-bar.vala:10
 #: ../src/client/folder-list/folder-list-search-branch.vala:38
 #: ../src/engine/api/geary-special-folder-type.vala:51
 msgid "Search"
 msgstr "Пошук"
 
-#. Search bar.
-#: ../src/client/components/main-toolbar.vala:78
+#. Search entry.
+#: ../src/client/components/search-bar.vala:25
 msgid "Search all mail in account for keywords (Ctrl+S)"
 msgstr "Шукати всю пошту в обліковому запису за ключовим словом (Ctrl+S)"
 
-#: ../src/client/components/main-toolbar.vala:212
+#: ../src/client/components/search-bar.vala:118
 #, c-format
 msgid "Indexing %s account"
 msgstr "Індексування облікового запису %s"
 
-#: ../src/client/components/main-toolbar.vala:223
+#: ../src/client/components/search-bar.vala:129
 #: ../src/client/folder-list/folder-list-search-branch.vala:39
 #, c-format
 msgid "Search %s account"
 msgstr "Пошук облікового запису %s"
 
-#: ../src/client/components/main-window.vala:323
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
 #: ../src/client/components/status-bar.vala:26
 msgid "Sending..."
 msgstr "Надсилання…"
 
-#: ../src/client/components/stock.vala:18
-#: ../ui/account_cannot_remove.glade.h:3
+#: ../src/client/components/stock.vala:18 ../ui/account_cannot_remove.glade.h:3
 msgid "_OK"
 msgstr "_Гаразд"
 
-#: ../src/client/components/stock.vala:19 ../ui/remove_confirm.glade.h:5
+#: ../src/client/components/stock.vala:19 ../ui/edit_alternate_emails.glade.h:3
+#: ../ui/password-dialog.glade.h:5 ../ui/remove_confirm.glade.h:5
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: ../src/client/components/stock.vala:23 ../ui/account_list.glade.h:4
-#: ../ui/preferences.glade.h:2
+#: ../src/client/components/stock.vala:23
 msgid "_Close"
 msgstr "_Закрити"
 
@@ -722,7 +809,7 @@ msgstr "В_илучити"
 
 #. Select all.
 #: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1047
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1341
 msgid "Select _All"
 msgstr "Вибрати _все"
 
@@ -730,132 +817,136 @@ msgstr "Вибрати _все"
 msgid "_Keep"
 msgstr "_Зберегти"
 
-#: ../src/client/composer/composer-widget.vala:57
+#: ../src/client/composer/composer-widget.vala:72
 msgid "Saved"
 msgstr "Збережено"
 
-#: ../src/client/composer/composer-widget.vala:58
+#: ../src/client/composer/composer-widget.vala:73
 msgid "Saving"
 msgstr "Зберігання"
 
-#: ../src/client/composer/composer-widget.vala:59
+#: ../src/client/composer/composer-widget.vala:74
 msgid "Error saving"
 msgstr "Помилка зберігання"
 
-#. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
-#: ../src/client/composer/composer-widget.vala:106
-msgid "attach|enclosed|enclosing|cover letter"
-msgstr "долуч|вклад|файл"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Press Backspace to delete quote"
+msgstr "Натисніть Backspace, щоб вилучити цитату"
+
+#: ../src/client/composer/composer-widget.vala:76
+msgid "New Message"
+msgstr "Створити лист"
 
-#: ../src/client/composer/composer-widget.vala:823
-msgid "Do you want to discard the unsaved message?"
-msgstr "Відкинути незбережений лист?"
+#. A list of keywords, separated by pipe ("|") characters, that suggest an attachment; since
+#. this is full-word checking, include all variants of each word.  No spaces are allowed.
+#: ../src/client/composer/composer-widget.vala:137
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
+"enclosing|encloses|enclosure|enclosures"
+msgstr ""
+"долучення|долучень|долучив|долучила|долучили|долучити|долучено|вкладення|вкл"
+"адень|вклав|влала|вклали|власти|вкладено"
 
-#: ../src/client/composer/composer-widget.vala:826
-#: ../src/client/composer/composer-widget.vala:830
+#: ../src/client/composer/composer-widget.vala:1101
+#: ../src/client/composer/composer-widget.vala:1105
 msgid "Do you want to discard this message?"
 msgstr "Відкинути цей лист?"
 
-#: ../src/client/composer/composer-widget.vala:911
+#: ../src/client/composer/composer-widget.vala:1261
 msgid "Send message with an empty subject and body?"
 msgstr "Надіслати лист без теми і текстом листа?"
 
-#: ../src/client/composer/composer-widget.vala:913
+#: ../src/client/composer/composer-widget.vala:1263
 msgid "Send message with an empty subject?"
 msgstr "Надіслати лист без теми?"
 
-#: ../src/client/composer/composer-widget.vala:915
+#: ../src/client/composer/composer-widget.vala:1265
 msgid "Send message with an empty body?"
 msgstr "Надіслати лист без тексту?"
 
-#: ../src/client/composer/composer-widget.vala:917
+#: ../src/client/composer/composer-widget.vala:1267
 msgid "Send message without an attachment?"
 msgstr "Надіслати лист без долучень?"
 
-#: ../src/client/composer/composer-widget.vala:1100
+#: ../src/client/composer/composer-widget.vala:1529
 msgid "Cannot add attachment"
 msgstr "Неможливо додати долучення"
 
-#: ../src/client/composer/composer-widget.vala:1111
+#: ../src/client/composer/composer-widget.vala:1540
 #, c-format
 msgid "\"%s\" could not be found."
 msgstr "«%s» неможливо знайти."
 
-#: ../src/client/composer/composer-widget.vala:1118
+#: ../src/client/composer/composer-widget.vala:1547
 #, c-format
 msgid "\"%s\" is a folder."
 msgstr "«%s» — тека."
 
-#: ../src/client/composer/composer-widget.vala:1125
+#: ../src/client/composer/composer-widget.vala:1554
 #, c-format
 msgid "\"%s\" is an empty file."
 msgstr "«%s» — порожній файл."
 
-#: ../src/client/composer/composer-widget.vala:1139
+#: ../src/client/composer/composer-widget.vala:1568
 #, c-format
 msgid "\"%s\" could not be opened for reading."
 msgstr "«%s» неможливо відкрити, щоб прочитати."
 
-#: ../src/client/composer/composer-widget.vala:1146
+#: ../src/client/composer/composer-widget.vala:1575
 #, 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-widget.vala:1155
+#: ../src/client/composer/composer-widget.vala:1584
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/client/composer/composer-widget.vala:1215
+#: ../src/client/composer/composer-widget.vala:1645
 msgid "To: "
 msgstr "Кому: "
 
-#: ../src/client/composer/composer-widget.vala:1218
+#: ../src/client/composer/composer-widget.vala:1648
 msgid "Cc: "
 msgstr "Копія: "
 
-#: ../src/client/composer/composer-widget.vala:1221
+#: ../src/client/composer/composer-widget.vala:1651
 msgid "Bcc: "
 msgstr "Потайна копія: "
 
-#: ../src/client/composer/composer-widget.vala:1438
+#: ../src/client/composer/composer-widget.vala:1654
+#| msgid "_Reply"
+msgid "Reply-To: "
+msgstr "Відповісти:"
+
+#: ../src/client/composer/composer-widget.vala:1887
 msgid "Select Color"
 msgstr "Вибрати колір"
 
+#. Displayed in the From dropdown to indicate an "alternate email address"
+#. for an account.  The first printf argument will be the alternate email
+#. address, and the second will be the account's primary email address.
+#: ../src/client/composer/composer-widget.vala:2322
+#, c-format
+msgid "%1$s via %2$s"
+msgstr "%1$s через %2$s"
+
 #. Composer label (with mnemonic underscore) for the account selector
 #. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:1884
+#: ../src/client/composer/composer-widget.vala:2364
 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.
-#: ../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:262
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "Жодну розмову не вибрано."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:264
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
 #, c-format
 msgid "%u conversation selected."
 msgid_plural "%u conversations selected."
@@ -863,51 +954,55 @@ msgstr[0] "%u розмову вибрано."
 msgstr[1] "%u розмови вибрано."
 msgstr[2] "%u розмов вибрано."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:293
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
 msgid "No search results found."
 msgstr "Не знайдено жодного результату."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:295
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
 msgid "No conversations in folder."
 msgstr "Немає розмов у теці."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:536
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
 msgid "This message contains remote images."
 msgstr "Цей лист містить віддалені зображення."
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:536
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
 msgid "Show Images"
 msgstr "Показати зображення"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:537
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
 msgid "Always Show From Sender"
 msgstr "Завжди показувати від відправника"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:561
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
 msgid "Edit Draft"
 msgstr "Редагувати чернетку"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:640
+#: ../src/client/conversation-viewer/conversation-viewer.vala:826
+msgid "From:"
+msgstr "Від:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:829
 msgid "To:"
 msgstr "Кому:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:643
+#: ../src/client/conversation-viewer/conversation-viewer.vala:832
 msgid "Cc:"
 msgstr "Копія:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:646
+#: ../src/client/conversation-viewer/conversation-viewer.vala:835
 msgid "Bcc:"
 msgstr "Потайна копія:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:649
+#: ../src/client/conversation-viewer/conversation-viewer.vala:838
 msgid "Subject:"
 msgstr "Тема:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:652
+#: ../src/client/conversation-viewer/conversation-viewer.vala:841
 msgid "Date:"
 msgstr "Дата:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:862
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1156
 #, c-format
 msgid "%u read message"
 msgid_plural "%u read messages"
@@ -915,64 +1010,64 @@ msgstr[0] "%u прочитаний лист"
 msgstr[1] "%u прочитаних листів"
 msgstr[2] "%u прочитаних листів"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:994
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1288
 #, c-format
 msgid "This message was sent successfully, but could not be saved to %s."
 msgstr "Цей лист успішно надіслано, проте його неможливо зберегти в %s."
 
 #. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1020
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1314
 #: ../ui/composer.glade.h:4
 msgid "_Copy"
 msgstr "_Копіювати"
 
 #. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1028
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1322
 msgid "Copy _Email Address"
 msgstr "Копіювати _поштову адресу"
 
 #. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1033
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1327
 #: ../ui/composer.glade.h:17
 msgid "Copy _Link"
 msgstr "Копіювати _посилання"
 
 #. Select message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1041
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1335
 msgid "Select _Message"
 msgstr "Вибрати _лист"
 
 #. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1053
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1347
 msgid "_Inspect"
 msgstr "_Дослідити"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1279
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1574
 msgid "This link appears to go to"
 msgstr "Це посилання начебто веде"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1280
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1575
 msgid "but actually goes to"
 msgstr "але насправді веде"
 
 #. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1335
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1630
 msgid " (Invalid?)"
 msgstr " (Неправильно?)"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1527
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1736
+msgid "_Save Image As..."
+msgstr "_Зберегти зображення як…"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1840
 msgid "_Save As..."
 msgstr "_Зберегти як…"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1532
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1845
 msgid "Save All A_ttachments..."
 msgstr "Зберегти всі _долучення…"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1546
-msgid "_Save Image As..."
-msgstr "_Зберегти зображення як…"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1569
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1865
 msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] "Зберегти долучення…"
@@ -980,41 +1075,41 @@ msgstr[1] "Зберегти долучення…"
 msgstr[2] "Зберегти всі долучення…"
 
 #. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1584
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1880
 msgid "Reply to _All"
 msgstr "Відповісти в_сім"
 
 #. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1601
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1897
 msgid "_Mark as Read"
 msgstr "_Зазначити як прочитане"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1605
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1901
 msgid "_Mark as Unread"
 msgstr "_Зазначити як непрочитане"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1611
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1907
 msgid "Mark Unread From _Here"
 msgstr "Зазначити непрочитаним _звідси"
 
 #. Separator.
 #. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1626
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1922
 msgid "_View Source"
 msgstr "_Глянути код"
 
 #. Generate the attachment table.
 #. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1940
-#: ../src/engine/rfc822/rfc822-utils.vala:327
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2246
+#: ../src/engine/rfc822/rfc822-utils.vala:378
 msgid "none"
 msgstr "немає"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2070
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2381
 msgid "Failed to open default text editor."
 msgstr "Не вдалося відкрити типовий текстовий редактор."
 
-#: ../src/client/conversation-viewer/conversation-web-view.vala:321
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
 #, c-format
 msgid "%s - Conversation Inspector"
 msgstr "%s — ревізор розмов"
@@ -1055,7 +1150,7 @@ msgstr ""
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:54
 msgid "Geary will not add or update this email account."
-msgstr "Geary не додаватиме і не оновлятиме цей поштовий обліковий запис."
+msgstr "Geary не додаватиме і не оновлюватиме цей поштовий обліковий запис."
 
 #: ../src/client/dialogs/certificate-warning-dialog.vala:59
 msgid ""
@@ -1111,8 +1206,8 @@ 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 password"
-msgstr "Уведіть ваш пароль"
+msgid "Geary requires your email password to continue"
+msgstr "Вкажіть ваш пароль для продовження"
 
 #. Label displaying total number of email messages in a folder
 #: ../src/client/folder-list/folder-list-folder-entry.vala:32
@@ -1278,7 +1373,7 @@ msgid "%A"
 msgstr "%A"
 
 #: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:741
+#: ../src/engine/rfc822/rfc822-message.vala:773
 msgid "(no subject)"
 msgstr "(без теми)"
 
@@ -1306,14 +1401,6 @@ 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"
@@ -1330,6 +1417,14 @@ msgstr "Outlook.com"
 msgid "Other"
 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-special-folder-type.vala:24
 msgid "Inbox"
 msgstr "Вхідні"
@@ -1370,75 +1465,107 @@ msgstr "Вихідні"
 msgid "Archive"
 msgstr "Архів"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:25
+#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
 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:662
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:705
 msgid "attachment"
 msgstr "долучення"
 
 #. / Can be typed in the search box like bcc:johndoe example com to find
-#. / messages bcc'd to a particular person.
+#. / messages bcc'd to a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
 #. Fields we allow the token to be "me" as in from:me.
-#: ../src/engine/imap-db/imap-db-account.vala:665
-#: ../src/engine/imap-db/imap-db-account.vala:684
+#: ../src/engine/imap-db/imap-db-account.vala:709
+#: ../src/engine/imap-db/imap-db-account.vala:737
 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:668
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:713
 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:671
-#: ../src/engine/imap-db/imap-db-account.vala:684
+#. / messages cc'd to a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:717
+#: ../src/engine/imap-db/imap-db-account.vala:737
 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:674
-#: ../src/engine/imap-db/imap-db-account.vala:684
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:721
+#: ../src/engine/imap-db/imap-db-account.vala:737
 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:677
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:725
 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:680
-#: ../src/engine/imap-db/imap-db-account.vala:684
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:729
+#: ../src/engine/imap-db/imap-db-account.vala:737
 msgid "to"
 msgstr "to"
 
+#. / Can be typed in the search box like is:read, is:unread or is:starred
+#. / to find messages that are read, unread, or starred.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:733
+msgid "is"
+msgstr "є"
+
 #. "me" can be typed like from:me or cc:me, etc. as a shorthand
-#. to find mail to or from yourself in search.
-#: ../src/engine/imap-db/imap-db-account.vala:699
+#. to find mail to or from yourself in search.  The translated
+#. string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:753
 msgid "me"
-msgstr "Я"
+msgstr "я"
+
+#: ../src/engine/imap-db/imap-db-account.vala:1207
+#| msgid "%d unread"
+#| msgid_plural "%d unread"
+msgid "read"
+msgstr "прочитаний"
+
+#: ../src/engine/imap-db/imap-db-account.vala:1209
+#| msgid "%d unread"
+#| msgid_plural "%d unread"
+msgid "unread"
+msgstr "непрочитаний"
+
+#: ../src/engine/imap-db/imap-db-account.vala:1211
+#| msgid "Starred"
+msgid "starred"
+msgstr "зірка"
 
 #. List of folder names to match for Drafts, separated by |.  Please add localized common
 #. names for the Drafts folder, leaving in the English names as well.  The first in the list
 #. will be the default, so please add the most common localized name to the front.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:535
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
 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:540
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 "Надіслано | Надіслане | Надіслана пошта | Надісланий лист | Sent | Sent Mail "
@@ -1447,7 +1574,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:545
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -1458,63 +1585,70 @@ 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:550
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Сміття | Смітник | Кошик | TTrash | Rubbish | Rubbish Bin"
 
+#. List of folder names to match for Archive, separated by |.  Please add localized common
+#. names for the Trash folder, leaving in the English names as well.  The first in the list
+#. will be the default, so please add the most common localized name to the front.
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr "Архів | Архіви | Archive | Archives"
+
 #. / 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
+#: ../src/engine/rfc822/rfc822-utils.vala:215
 msgid "%a, %b %-e, %Y at %-l:%M %p"
 msgstr "%a, %b %-e, %Y at %-l:%M %p"
 
 #. / The quoted header for a message being replied to.
 #. / %1$s will be substituted for the date, and %2$s will be substituted for
 #. / the original sender.
-#: ../src/engine/rfc822/rfc822-utils.vala:171
+#: ../src/engine/rfc822/rfc822-utils.vala:221
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr "Написано %1$s, %2$s:"
 
 #. / The quoted header for a message being replied to (in case the date is not known).
 #. / %s will be replaced by the original sender.
-#: ../src/engine/rfc822/rfc822-utils.vala:178
+#: ../src/engine/rfc822/rfc822-utils.vala:228
 #, c-format
 msgid "%s wrote:"
 msgstr "%s:"
 
 #. / The quoted header for a message being replied to (in case the sender is not known).
 #. / %s will be replaced by the original date
-#: ../src/engine/rfc822/rfc822-utils.vala:184
+#: ../src/engine/rfc822/rfc822-utils.vala:234
 #, c-format
 msgid "On %s:"
 msgstr "Написано %s:"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:211
+#: ../src/engine/rfc822/rfc822-utils.vala:263
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Пересланий лист ----------"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:215
+#: ../src/engine/rfc822/rfc822-utils.vala:267
 #, c-format
 msgid "From: %s\n"
 msgstr "Від: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:216
+#: ../src/engine/rfc822/rfc822-utils.vala:268
 #, c-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:217
+#: ../src/engine/rfc822/rfc822-utils.vala:269
 #, c-format
 msgid "Date: %s\n"
 msgstr "Дата: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:220
+#: ../src/engine/rfc822/rfc822-utils.vala:272
 #, c-format
 msgid "To: %s\n"
 msgstr "Кому: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:223
+#: ../src/engine/rfc822/rfc822-utils.vala:275
 #, c-format
 msgid "Cc: %s\n"
 msgstr "Копія: %s\n"
@@ -1647,111 +1781,177 @@ msgid "_Rich Text"
 msgstr "_Форматований текст"
 
 #: ../ui/composer.glade.h:23
+msgid "Show Extended Fields"
+msgstr "Показати додаткові поля"
+
+#: ../ui/composer.glade.h:24
+msgctxt "Label"
+msgid "Close and Save"
+msgstr "Закрити і зберегти"
+
+#: ../ui/composer.glade.h:25
+msgctxt "Short Label"
+msgid "Close and Save"
+msgstr "Закрити і зберегти"
+
+#: ../ui/composer.glade.h:26
+msgctxt "Tooltip"
+msgid "Close and Save"
+msgstr "Закрити і зберегти"
+
+#: ../ui/composer.glade.h:27
+msgctxt "Label"
+msgid "Close and Discard"
+msgstr "Закрити і відкинути"
+
+#: ../ui/composer.glade.h:28
+msgctxt "Short Label"
+msgid "Close and Discard"
+msgstr "Закрити і відкинути"
+
+#: ../ui/composer.glade.h:29
+msgctxt "Tooltip"
+msgid "Close and Discard"
+msgstr "Закрити і відкинути"
+
+#: ../ui/composer.glade.h:30
 msgid "Lar_ge"
 msgstr "Ве_ликий"
 
-#: ../ui/composer.glade.h:24
+#: ../ui/composer.glade.h:31
 msgid "Large"
 msgstr "Великий"
 
-#: ../ui/composer.glade.h:25
+#: ../ui/composer.glade.h:32
 msgid "_Medium"
 msgstr "_Середній"
 
-#: ../ui/composer.glade.h:26
+#: ../ui/composer.glade.h:33
 msgid "Medium"
 msgstr "Середній"
 
-#: ../ui/composer.glade.h:27
+#: ../ui/composer.glade.h:34
 msgid "_Small"
 msgstr "_Малий"
 
-#: ../ui/composer.glade.h:28
+#: ../ui/composer.glade.h:35
 msgid "Small"
 msgstr "Малий"
 
-#: ../ui/composer.glade.h:29
+#: ../ui/composer.glade.h:36
 msgid "S_ans Serif"
 msgstr "_Без засічок"
 
-#: ../ui/composer.glade.h:30
+#: ../ui/composer.glade.h:37
 msgid "Sans Serif"
 msgstr "Без засічок"
 
-#: ../ui/composer.glade.h:31
+#: ../ui/composer.glade.h:38
 msgid "S_erif"
 msgstr "_З засічками"
 
-#: ../ui/composer.glade.h:32
+#: ../ui/composer.glade.h:39
 msgid "Serif"
 msgstr "З засічками"
 
-#: ../ui/composer.glade.h:33
+#: ../ui/composer.glade.h:40
 msgid "_Fixed Width"
 msgstr "_Фіксованої ширини"
 
-#: ../ui/composer.glade.h:34
+#: ../ui/composer.glade.h:41
 msgid "Fixed Width"
 msgstr "Фіксована ширина"
 
-#: ../ui/composer.glade.h:35
+#: ../ui/composer.glade.h:42
 msgid "Detach"
 msgstr "Викинути"
 
-#: ../ui/composer.glade.h:36
+#: ../ui/composer.glade.h:43
+#| msgid "Italic (Ctrl+I)"
+msgid "Detach (Ctrl+D)"
+msgstr "Від'єднати (Ctrl+D)"
+
+#: ../ui/composer.glade.h:44
 msgid "_Send"
 msgstr "_Надіслати"
 
-#: ../ui/composer.glade.h:37
+#: ../ui/composer.glade.h:45
 msgid "Send"
 msgstr "Надіслати"
 
-#: ../ui/composer.glade.h:38
+#: ../ui/composer.glade.h:46
+#| msgid "Bold (Ctrl+B)"
+msgid "Send (Ctrl+Enter)"
+msgstr "Надіслати (Ctrl+Enter)"
+
+#: ../ui/composer.glade.h:47
 msgid "_Attach File"
 msgstr "_Долучити файл"
 
-#: ../ui/composer.glade.h:39
+#: ../ui/composer.glade.h:48
 msgid "Attach File"
 msgstr "Долучити файл"
 
-#: ../ui/composer.glade.h:40
+#: ../ui/composer.glade.h:49
 msgid "_Include Original Attachments"
 msgstr "_Вкласти початкові долучення"
 
-#: ../ui/composer.glade.h:41
+#: ../ui/composer.glade.h:50
 msgid "Include Original Attachments"
 msgstr "Вкласти початкові долучення"
 
 #. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:43
+#: ../ui/composer.glade.h:52
 msgid "_To"
 msgstr "_Кому"
 
-#: ../ui/composer.glade.h:44
+#: ../ui/composer.glade.h:53
 msgid "_Cc"
 msgstr "Ко_пія"
 
-#: ../ui/composer.glade.h:45
+#: ../ui/composer.glade.h:54
 msgid "_Subject"
 msgstr "_Тема"
 
-#: ../ui/composer.glade.h:46
+#: ../ui/composer.glade.h:55
 msgid "_Bcc"
 msgstr "По_тайна копія"
 
+#: ../ui/composer.glade.h:56
+#| msgid "_Reply"
+msgid "_Reply-To"
+msgstr "_Відповісти"
+
 #. Geary account mail will be sent from
-#: ../ui/composer.glade.h:48
+#: ../ui/composer.glade.h:58
 msgid "From"
 msgstr "Від"
 
-#: ../ui/composer.glade.h:49
+#: ../ui/composer.glade.h:59
 msgid "Drop files here"
 msgstr "Перетягніть файли сюди"
 
-#: ../ui/composer.glade.h:50
+#: ../ui/composer.glade.h:60
 msgid "To add them as attachments"
 msgstr "Щоб додати їх як долучення"
 
+#: ../ui/edit_alternate_emails.glade.h:1
+#| msgid "E_mail address"
+msgid "Remove email address"
+msgstr "Вилучити поштову адресу"
+
+#: ../ui/edit_alternate_emails.glade.h:2
+msgid ""
+"Some email services require additional addresses be configured on the "
+"server.  Contact your email provider for more information."
+msgstr ""
+"Деякі поштові служби вимагають налаштувати додаткові адреси на сервері. "
+"Зв'яться з вашим постачальником за подробицями."
+
+#: ../ui/edit_alternate_emails.glade.h:4
+msgid "_Update"
+msgstr "_Оновити"
+
 #: ../ui/find_bar.glade.h:1
 msgid "Find:"
 msgstr "Знайти:"
@@ -1772,7 +1972,7 @@ msgstr "_Враховувати регістр"
 msgid "label"
 msgstr "мітка"
 
-#: ../ui/login.glade.h:1
+#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
 msgid "Password"
 msgstr "Пароль"
 
@@ -1805,152 +2005,167 @@ msgid "_Save sent mail"
 msgstr "З_берегти надіслану пошту"
 
 #: ../ui/login.glade.h:10
+msgid "Addi_tional email addresses…"
+msgstr "_Додактові поштові адреси…"
+
+#: ../ui/login.glade.h:11
 msgid "IMAP settings"
 msgstr "Параметри IMAP"
 
-#: ../ui/login.glade.h:11
+#: ../ui/login.glade.h:12
 msgid "Se_rver"
 msgstr "Се_рвер"
 
-#: ../ui/login.glade.h:12
+#: ../ui/login.glade.h:13
 msgid "P_ort"
 msgstr "Пор_т"
 
-#: ../ui/login.glade.h:13
+#: ../ui/login.glade.h:14
 msgid "Ser_ver"
 msgstr "Се_рвер"
 
-#: ../ui/login.glade.h:14
+#: ../ui/login.glade.h:15
 msgid "Por_t"
 msgstr "Пор_т"
 
-#: ../ui/login.glade.h:15
+#: ../ui/login.glade.h:16
 msgid "SMTP settings"
 msgstr "Параметри SMTP"
 
-#: ../ui/login.glade.h:16
+#: ../ui/login.glade.h:17
 msgid "User_name"
 msgstr "_Користувач"
 
-#: ../ui/login.glade.h:17
+#: ../ui/login.glade.h:18
 msgid "Pass_word"
 msgstr "Па_роль"
 
-#: ../ui/login.glade.h:18
+#: ../ui/login.glade.h:19
 msgid "SMTP username"
 msgstr "Користувач SMTP"
 
-#: ../ui/login.glade.h:19
+#: ../ui/login.glade.h:20
 msgid "SMTP password"
 msgstr "Пароль SMTP"
 
-#: ../ui/login.glade.h:20
+#: ../ui/login.glade.h:21
 msgid "_Username"
 msgstr "_Користувач"
 
-#: ../ui/login.glade.h:21
+#: ../ui/login.glade.h:22
 msgid "IMAP username"
 msgstr "Користувач IMAP"
 
-#: ../ui/login.glade.h:22
+#: ../ui/login.glade.h:23
 msgid "IMAP password"
 msgstr "Пароль IMAP"
 
-#: ../ui/login.glade.h:23
+#: ../ui/login.glade.h:24
 msgid "Encr_yption"
 msgstr "_Шифрування"
 
-#: ../ui/login.glade.h:24
+#: ../ui/login.glade.h:25
 msgid "Encrypt_ion"
 msgstr "_Шифрування"
 
-#: ../ui/login.glade.h:26
+#: ../ui/login.glade.h:27
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
-#: ../ui/login.glade.h:27
+#: ../ui/login.glade.h:28
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: ../ui/login.glade.h:28
+#: ../ui/login.glade.h:29
 msgid "No authentication re_quired"
 msgstr "Не потрібно за_свідчення"
 
-#: ../ui/login.glade.h:29
+#: ../ui/login.glade.h:30
 msgid "Use IMAP cre_dentials"
 msgstr "Використовувати _реєстраційні дані IMAP"
 
-#: ../ui/login.glade.h:30
-msgid "Storage"
-msgstr "Пам'ять"
-
-#: ../ui/login.glade.h:31
-msgid "_Download mail"
-msgstr "_Звантажити пошту"
-
-#: ../ui/login.glade.h:32 ../ui/preferences.glade.h:6
+#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
 msgid "Composer"
 msgstr "Редактор"
 
-#: ../ui/login.glade.h:33
+#: ../ui/login.glade.h:32
 msgid "Save dra_fts on server"
 msgstr "Зберігати _черевики на сервері"
 
+#: ../ui/login.glade.h:33
+#| msgid "Si_gn emails:"
+msgid "Si_gn emails (HTML allowed):"
+msgstr "_Підписати пошту (дозволено HTML):"
+
 #: ../ui/login.glade.h:34
-msgid "Si_gn emails:"
-msgstr "_Підписати пошту:"
+msgid "Storage"
+msgstr "Пам'ять"
+
+#: ../ui/login.glade.h:35
+msgid "_Download mail"
+msgstr "_Звантажити пошту"
 
 #: ../ui/password-dialog.glade.h:1
 msgid "SMTP Credentials"
 msgstr "Реєстраційні дані SMTP"
 
 #: ../ui/password-dialog.glade.h:2
-msgid "Username:"
-msgstr "Користувач:"
-
-#: ../ui/password-dialog.glade.h:3
-msgid "Password:"
-msgstr "Пароль:"
+#| msgid "_Username"
+msgid "Username"
+msgstr "Користувач"
 
 #: ../ui/password-dialog.glade.h:4
 msgid "_Remember password"
 msgstr "_Запам'ятати пароль"
 
-#: ../ui/preferences.glade.h:1
-msgid "Preferences"
-msgstr "Параметри"
+#: ../ui/password-dialog.glade.h:6
+msgid "_Authenticate"
+msgstr "_Засвідчення"
 
-#: ../ui/preferences.glade.h:3
+#: ../ui/preferences.glade.h:1
 msgid "Reading"
 msgstr "Читання"
 
-#: ../ui/preferences.glade.h:4
+#: ../ui/preferences.glade.h:2
 msgid "_Automatically select next message"
 msgstr "_Автоматично вибирати наступний лист"
 
-#: ../ui/preferences.glade.h:5
+#: ../ui/preferences.glade.h:3
 msgid "_Display conversation preview"
 msgstr "_Показувати попередній огляд розмови"
 
-#: ../ui/preferences.glade.h:7
+#: ../ui/preferences.glade.h:4
+msgid "Use _three pane view"
+msgstr "Використовувати _ієрархію"
+
+#: ../ui/preferences.glade.h:6
 msgid "Enable _spell checking"
 msgstr "Перевіряти _орфографію"
 
-#: ../ui/preferences.glade.h:8
+#: ../ui/preferences.glade.h:7
 msgid "Notifications"
 msgstr "Сповіщення"
 
-#: ../ui/preferences.glade.h:9
+#: ../ui/preferences.glade.h:8
 msgid "_Play notification sounds"
 msgstr "Про_гравати звукові сповіщення "
 
-#: ../ui/preferences.glade.h:10
+#: ../ui/preferences.glade.h:9
 msgid "Show _notifications for new mail"
 msgstr "Показувати _сповіщення про нову пошту"
 
+#: ../ui/preferences.glade.h:10
+#| msgid "Show _notifications for new mail"
+msgid "Always _watch for new mail"
+msgstr "Завжди _дивитись за новими листами"
+
 #: ../ui/preferences.glade.h:11
-msgid "Notify of new mail at start_up"
-msgstr "Сповіщати про нову пошту під час _запуску"
+msgid "Geary will run in the background and notify of new mail"
+msgstr "Geary буде запущено на тлі і сповіщати про нові листи"
+
+#: ../ui/preferences.glade.h:12
+msgid "Preferences"
+msgstr "Параметри"
 
 #: ../ui/remove_confirm.glade.h:1
 msgid ""
@@ -1976,8 +2191,39 @@ msgid "Email address:"
 msgstr "Електрона адреса:"
 
 #: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary upgrade in progress."
-msgstr "Оновлення Geary."
+#| msgid "Geary upgrade in progress."
+msgid "Geary update in progress…"
+msgstr "Виконується оновлення…"
+
+#~ msgid "Copyright 2011-2014 Yorba Foundation"
+#~ msgstr "© 2011-2014 Yorba Foundation"
+
+#~ msgid "_Delete"
+#~ msgstr "_Вилучити"
+
+#~ msgid "_Trash"
+#~ msgstr "_Смітник"
+
+#~ msgid "_Donate"
+#~ msgstr "По_жертвувати"
+
+#~ msgid "attach|enclosed|enclosing|cover letter"
+#~ msgstr "долуч|вклад|файл"
+
+#~ msgid "Do you want to discard the unsaved message?"
+#~ msgstr "Відкинути незбережений лист?"
+
+#~ msgid "Please enter your password"
+#~ msgstr "Уведіть ваш пароль"
+
+#~ msgid "Username:"
+#~ msgstr "Користувач:"
+
+#~ msgid "Password:"
+#~ msgstr "Пароль:"
+
+#~ msgid "Notify of new mail at start_up"
+#~ msgstr "Сповіщати про нову пошту під час _запуску"
 
 #~ msgid "C_lose"
 #~ msgstr "_Закрити"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]