[geary] Update Russian translation

[Translations User D-L <translations src gnome org>]

commit e4d409c2d21a42f0c03451178d46d601a75bca2d
Author: Aleksandr Melman <Alexmelman88 gmail com>
Date:   Mon Sep 27 02:01:15 2021 +0000

    Update Russian translation

 po/ru.po | 5496 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 3460 insertions(+), 2036 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index 0fc28961c..dff142246 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,67 +10,70 @@
 # mynameisdaniil <sobol daniil gmail com>, 2012
 # Aleksandr Stepanov <alex eri ya ru>, 2015.
 # Stas Solovey <whats_up tut by>, 2015, 2016, 2018.
+# Melman <Alexmelman88 gmail com>, 2021.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
-"POT-Creation-Date: 2018-09-23 02:34+0000\n"
-"PO-Revision-Date: 2018-09-25 23:14+0300\n"
-"Last-Translator: Stas Solovey <whats_up tut by>\n"
-"Language-Team: Русский <gnome-cyr gnome org>\n"
+"POT-Creation-Date: 2021-05-15 12:19+0000\n"
+"PO-Revision-Date: 2021-09-25 14:43+0300\n"
+"Last-Translator: Melman <Alexmelman88 gmail com>\n"
+"Language-Team: Russian <Alexmelman88 gmail com>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 2.1.1\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"X-Generator: Gtranslator 40.0\n"
+"X-DL-Team: ru\n"
+"X-DL-Module: geary\n"
+"X-DL-Branch: mainline\n"
+"X-DL-Domain: po\n"
+"X-DL-State: Translated\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
 msgstr "Отправить по эл. почте"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: desktop/geary-attach.contract.desktop.in:5
-msgid "mail-send"
-msgstr "mail-send"
+#: desktop/geary-attach.contract.desktop.in:6
+msgid "Send files using Geary"
+msgstr "Отправить файлы с помощью Geary"
 
 #. Translators: The application name
-#: desktop/geary-autostart.desktop.in:3
-#: desktop/org.gnome.Geary.appdata.xml.in:11
-#: desktop/org.gnome.Geary.desktop.in:3
+#: desktop/geary-autostart.desktop.in.in:3
+#: desktop/org.gnome.Geary.appdata.xml.in.in:11
+#: desktop/org.gnome.Geary.desktop.in.in:3
+#: src/client/accounts/accounts-editor-servers-pane.vala:552
+#: src/client/application/application-main-window.vala:704
 msgid "Geary"
 msgstr "Geary"
 
-#: desktop/geary-autostart.desktop.in:4 desktop/org.gnome.Geary.desktop.in:4
+#: desktop/geary-autostart.desktop.in.in:4
+#: desktop/org.gnome.Geary.desktop.in.in:4
 msgid "Email"
 msgstr "Электронная почта"
 
 #. Translators: The application's summary / tagline
-#: desktop/geary-autostart.desktop.in:5
-#: desktop/org.gnome.Geary.appdata.xml.in:15
-#: desktop/org.gnome.Geary.desktop.in:5
-#: src/client/application/geary-application.vala:21
+#: desktop/geary-autostart.desktop.in.in:5
+#: desktop/org.gnome.Geary.appdata.xml.in.in:15
+#: desktop/org.gnome.Geary.desktop.in.in:5
+#: src/client/application/application-client.vala:33
 msgid "Send and receive email"
 msgstr "Отправка и получение электронной почты"
 
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: desktop/geary-autostart.desktop.in:7
+#: desktop/geary-autostart.desktop.in.in:7
 msgid "Email;E-mail;Mail;"
-msgstr "Электронная;Почта;Email;E-mail;Mail;"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: desktop/geary-autostart.desktop.in:9 desktop/org.gnome.Geary.desktop.in:9
-msgid "org.gnome.Geary"
-msgstr "org.gnome.Geary"
+msgstr "Email;E-mail;Mail;"
 
 #. Translators: The development team's name
-#: desktop/org.gnome.Geary.appdata.xml.in:13
+#: desktop/org.gnome.Geary.appdata.xml.in.in:13
 msgid "Geary Development Team"
 msgstr "Команда разработчиков Geary"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:17
+#: desktop/org.gnome.Geary.appdata.xml.in.in:17
 msgid ""
 "Geary is an email application built around conversations, for the GNOME 3 "
 "desktop. It allows you to read, find and send email with a straightforward, "
@@ -80,7 +83,7 @@ msgstr ""
 "по принципу обмена сообщениями — беседами. Позволяет читать, находить и "
 "отправлять электронную почту с простым, современным интерфейсом."
 
-#: desktop/org.gnome.Geary.appdata.xml.in:22
+#: desktop/org.gnome.Geary.appdata.xml.in.in:22
 msgid ""
 "Conversations allow you to read a complete discussion without having to find "
 "and click from message to message."
@@ -88,542 +91,1071 @@ msgstr ""
 "Беседы позволяют читать переписку целиком без необходимости искать и "
 "переходить от сообщения к сообщению."
 
-#: desktop/org.gnome.Geary.appdata.xml.in:26
+#: desktop/org.gnome.Geary.appdata.xml.in.in:26
 msgid "Geary’s features include:"
 msgstr "К функциям Geary относятся:"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:28
+#: desktop/org.gnome.Geary.appdata.xml.in.in:28
 msgid "Quick email account setup"
 msgstr "Быстрая настройка учётной записи электронной почты"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:29
+#: desktop/org.gnome.Geary.appdata.xml.in.in:29
 msgid "Shows related messages together in conversations"
 msgstr "Отображение связанных сообщений в режиме беседы"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:30
+#: desktop/org.gnome.Geary.appdata.xml.in.in:30
 msgid "Fast, full text and keyword search"
 msgstr "Быстрый полнотекстовый поиск и поиск по ключевым словам"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:31
+#: desktop/org.gnome.Geary.appdata.xml.in.in:31
 msgid "Full-featured HTML and plain text message composer"
 msgstr ""
 "Полнофункциональный режим составления писем в виде простого текста, а также "
 "с HTML разметкой"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:32
+#: desktop/org.gnome.Geary.appdata.xml.in.in:32
 msgid "Desktop notification of new mail"
 msgstr "Уведомления о новых сообщениях"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:33
+#: desktop/org.gnome.Geary.appdata.xml.in.in:33
 msgid "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
 msgstr "Совместим с GMail, Yahoo! Mail, Outlook.com и другими IMAP серверами"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in:47
+#: desktop/org.gnome.Geary.appdata.xml.in.in:50
 msgid "Geary displaying a conversation"
 msgstr "Интерфейс обмена сообщениями Geary"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in:52
+#: desktop/org.gnome.Geary.appdata.xml.in.in:55
 msgid "Geary showing the rich text composer"
 msgstr "Интерфейс редактирования текста Geary"
 
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: desktop/org.gnome.Geary.desktop.in:7
+#: desktop/org.gnome.Geary.desktop.in.in:7
 msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 msgstr "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 
-#: desktop/org.gnome.Geary.desktop.in:21 ui/gtk/menus.ui:7
+#: desktop/org.gnome.Geary.desktop.in.in:22
 msgid "Compose Message"
-msgstr "Новое сообщение"
+msgstr "Написать Сообщение"
+
+#: desktop/org.gnome.Geary.desktop.in.in:26
+msgid "New Window"
+msgstr "Новое Окно"
 
 #: desktop/org.gnome.Geary.gschema.xml:8
-msgid "Default attachments directory"
-msgstr "Каталог по умолчанию для вложений"
+msgid "Maximize window"
+msgstr "Развернуть окно"
 
 #: desktop/org.gnome.Geary.gschema.xml:9
-msgid "Location used when opening and saving attachments."
-msgstr "Расположение используемое при открытии и сохранении вложений."
+msgid "True if the application window is maximized, false otherwise."
+msgstr ""
+"Значение \"true\", если окно программы развернуто; значение \"false\", если "
+"нет."
 
 #: desktop/org.gnome.Geary.gschema.xml:14
-msgid "Default print output directory"
-msgstr "Каталог по умолчанию для вывода печати"
+msgid "Width of window"
+msgstr "Ширина окна"
 
 #: desktop/org.gnome.Geary.gschema.xml:15
-msgid "Location used when printing to a file."
-msgstr "Расположение используемое при печати в файл."
+msgid "The last recorded width of the application window."
+msgstr "Последнее сохраненное значение ширины окна программы."
 
 #: desktop/org.gnome.Geary.gschema.xml:20
-msgid "Maximize window"
-msgstr "Развернуть окно"
+msgid "Height of window"
+msgstr "Высота окна"
 
 #: desktop/org.gnome.Geary.gschema.xml:21
-msgid "True if the application window is maximized, false otherwise."
-msgstr ""
+msgid "The last recorded height of the application window."
+msgstr "Последнее сохраненное значение высоты окна программы."
 
 #: desktop/org.gnome.Geary.gschema.xml:26
-msgid "Width of window"
-msgstr "Ширина окна"
+msgid "Show/hide formatting toolbar"
+msgstr "Показать/скрыть панель форматирования"
 
 #: desktop/org.gnome.Geary.gschema.xml:27
-msgid "The last recorded width of the application window."
+msgid "True if the formatting toolbar in the composer is shown."
 msgstr ""
+"Если имеет значение «true», панель форматирования в окне редактора будет "
+"показана."
 
 #: desktop/org.gnome.Geary.gschema.xml:32
-msgid "Height of window"
-msgstr "Высота окна"
+msgid "Autoselect next message"
+msgstr "Автопереход к следующему сообщению"
 
 #: desktop/org.gnome.Geary.gschema.xml:33
-msgid "The last recorded height of the application window."
-msgstr ""
+msgid "True if we should autoselect the next available conversation."
+msgstr "Значение \"true\" означает автовыбор следующей доступной беседы."
 
 #: desktop/org.gnome.Geary.gschema.xml:38
-msgid "Position of folder list pane"
-msgstr ""
+msgid "Display message previews"
+msgstr "Показывать предпросмотр сообщений"
 
 #: desktop/org.gnome.Geary.gschema.xml:39
-msgid "Position of the folder list Paned grabber."
+msgid "True if we should display a short preview of each message."
 msgstr ""
+"Если имеет значение \"true\", программа должна показывать короткий "
+"предпросмотр каждого сообщения."
 
 #: desktop/org.gnome.Geary.gschema.xml:44
-msgid "Position of folder list pane when horizontal"
-msgstr ""
+msgid "Use single key shortcuts"
+msgstr "Использовать одноклавишные горячие клавиши"
 
 #: desktop/org.gnome.Geary.gschema.xml:45
 msgid ""
-"Position of the folder list Paned grabber in the horizontal orientation."
-msgstr ""
-
-#: desktop/org.gnome.Geary.gschema.xml:50
-msgid "Position of folder list pane when vertical"
-msgstr ""
-
-#: desktop/org.gnome.Geary.gschema.xml:51
-msgid "Position of the folder list Paned grabber in the vertical orientation."
-msgstr ""
-
-#: desktop/org.gnome.Geary.gschema.xml:56
-msgid "Orientation of the folder list pane"
-msgstr ""
-
-#: desktop/org.gnome.Geary.gschema.xml:57
-msgid "True if the folder list Paned is in the horizontal orientation."
-msgstr ""
-
-#: desktop/org.gnome.Geary.gschema.xml:62
-msgid "Position of message list pane"
-msgstr ""
-
-#: desktop/org.gnome.Geary.gschema.xml:63
-msgid "Position of the message list Paned grabber."
-msgstr ""
-
-#: desktop/org.gnome.Geary.gschema.xml:68
-msgid "Autoselect next message"
-msgstr "Автопереход к следующему сообщению"
-
-#: desktop/org.gnome.Geary.gschema.xml:69
-msgid "True if we should autoselect the next available conversation."
-msgstr ""
-
-#: desktop/org.gnome.Geary.gschema.xml:74
-msgid "Display message previews"
-msgstr "Показывать предпросмотр сообщений"
-
-#: desktop/org.gnome.Geary.gschema.xml:75
-msgid "True if we should display a short preview of each message."
+"Enables shortcuts for email actions that do not require pressing <Ctrl> to "
+"emulate those used by Gmail."
 msgstr ""
+"Включить комбинации клавиш для действий электронной почты, не требующих "
+"нажатия клавиши <Ctrl>, для эмуляции тех, которые используются в Gmail."
 
-#: desktop/org.gnome.Geary.gschema.xml:80
+#: desktop/org.gnome.Geary.gschema.xml:52
 msgid "Languages that shall be used in the spell checker"
-msgstr ""
+msgstr "Языки, которые должны использоваться в программе проверки орфографии"
 
-#: desktop/org.gnome.Geary.gschema.xml:81
-msgid "List of the languages to use in the spell checker."
+#: desktop/org.gnome.Geary.gschema.xml:53
+msgid ""
+"A list of POSIX locales, with the empty list disabling spell checking and "
+"the null list using desktop languages by default."
 msgstr ""
+"Список локалей POSIX, при этом пустой список отключает проверку орфографии, "
+"а нулевой список использует языки рабочего стола по умолчанию."
 
-#: desktop/org.gnome.Geary.gschema.xml:86
+#: desktop/org.gnome.Geary.gschema.xml:60
 msgid "Languages that are displayed in the spell checker popover"
-msgstr ""
+msgstr "Языки, отображаемые во всплывающем окне проверки орфографии"
 
-#: desktop/org.gnome.Geary.gschema.xml:87
+#: desktop/org.gnome.Geary.gschema.xml:61
 msgid ""
 "List of languages that are always displayed in the popover of the spell "
 "checker."
 msgstr ""
+"Список языков, которые всегда отображаются во всплывающем окне программы "
+"проверки орфографии."
 
-#: desktop/org.gnome.Geary.gschema.xml:92
-msgid "Enable notification sounds"
-msgstr "Включить звуковые уведомления"
-
-#: desktop/org.gnome.Geary.gschema.xml:93
-msgid "True to play sounds for notifications and sending."
-msgstr ""
-
-#: desktop/org.gnome.Geary.gschema.xml:98
-msgid "Show notifications for new mail"
-msgstr "Показывать уведомления о новых сообщениях"
-
-#: desktop/org.gnome.Geary.gschema.xml:99
-msgid "True to show notification bubbles."
-msgstr ""
-
-#: desktop/org.gnome.Geary.gschema.xml:104
+#: desktop/org.gnome.Geary.gschema.xml:66
 msgid "Notify of new mail at startup"
-msgstr ""
+msgstr "Уведомлять о новой почте при запуске"
 
-#: desktop/org.gnome.Geary.gschema.xml:105
+#: desktop/org.gnome.Geary.gschema.xml:67
 msgid "True to notify of new mail at startup."
-msgstr "Значение true для включения уведомлений о новой почте при запуске."
+msgstr "Значение \"true\" для включения уведомления о новой почте при запуске."
 
-#: desktop/org.gnome.Geary.gschema.xml:110
+#: desktop/org.gnome.Geary.gschema.xml:72
 msgid "Ask when opening an attachment"
-msgstr ""
+msgstr "Спрашивать при открытии вложения"
 
-#: desktop/org.gnome.Geary.gschema.xml:111
+#: desktop/org.gnome.Geary.gschema.xml:73
 msgid "True to ask when opening an attachment."
-msgstr "Значение true чтобы спрашивать перед открытием вложения."
+msgstr "Значение \"true\", чтобы спрашивать перед открытием вложения."
 
-#: desktop/org.gnome.Geary.gschema.xml:116
+#: desktop/org.gnome.Geary.gschema.xml:78
 msgid "Whether to compose emails in HTML"
-msgstr ""
+msgstr "Можно ли составлять электронные письма в формате HTML"
 
-#: desktop/org.gnome.Geary.gschema.xml:117
+#: desktop/org.gnome.Geary.gschema.xml:79
 msgid "True to compose emails in HTML; false for plain text."
 msgstr ""
+"Значение \"true\" для составления писем в формате HTML; \"false\" для "
+"обычного текста."
 
-#: desktop/org.gnome.Geary.gschema.xml:122
+#: desktop/org.gnome.Geary.gschema.xml:84
 msgid "Advisory strategy for full-text searching"
-msgstr ""
+msgstr "Рекомендуемая стратегия для полнотекстового поиска"
 
-#: desktop/org.gnome.Geary.gschema.xml:123
+#: desktop/org.gnome.Geary.gschema.xml:85
 msgid ""
 "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
 msgstr ""
+"Допустимые значения: \"точный\", \"консервативный\", \"агрессивный\" и "
+"\"горизонтальный\"."
 
-#: desktop/org.gnome.Geary.gschema.xml:128
+#: desktop/org.gnome.Geary.gschema.xml:90
 msgid "Zoom of conversation viewer"
 msgstr "Масштаб окна переписки"
 
-#: desktop/org.gnome.Geary.gschema.xml:129
+#: desktop/org.gnome.Geary.gschema.xml:91
 msgid "The zoom to apply on the conservation view."
-msgstr "Масштаб применяемый к виду переписки."
+msgstr "Масштаб применяемый к окну переписки."
 
-#: desktop/org.gnome.Geary.gschema.xml:134
+#: desktop/org.gnome.Geary.gschema.xml:96
 msgid "Size of detached composer window"
-msgstr "Размер отсоединённого окна композитора"
+msgstr "Размер отсоединенного окна редактора"
 
-#: desktop/org.gnome.Geary.gschema.xml:135
+#: desktop/org.gnome.Geary.gschema.xml:97
 msgid "The last recorded size of the detached composer window."
+msgstr "Последний сохраненный размер отсоединенного окна редактора."
+
+#: desktop/org.gnome.Geary.gschema.xml:102
+#| msgid "Error sending email"
+msgid "Undo sending email delay"
+msgstr "Отменить задержку отправки электронной почты"
+
+#: desktop/org.gnome.Geary.gschema.xml:103
+msgid ""
+"The number of seconds to wait before sending an email. Set to zero or less "
+"to disable."
 msgstr ""
+"Количество секунд ожидания перед отправкой электронного письма. Установите "
+"значение ноль или меньше, чтобы отключить."
 
-#: desktop/org.gnome.Geary.gschema.xml:140
-msgid "Whether we migrated the old settings"
+#: desktop/org.gnome.Geary.gschema.xml:109
+msgid "Brief notification display time"
+msgstr "Краткое время отображения уведомлений"
+
+#: desktop/org.gnome.Geary.gschema.xml:110
+msgid ""
+"The length of time in seconds for which brief notifications should be "
+"displayed."
 msgstr ""
+"Время в секундах, в течение которого должны отображаться краткие уведомления."
 
-#: desktop/org.gnome.Geary.gschema.xml:141
+#: desktop/org.gnome.Geary.gschema.xml:116
+msgid "List of optional plugins"
+msgstr "Список дополнительных плагинов"
+
+#: desktop/org.gnome.Geary.gschema.xml:117
+msgid "Plugins listed here will be loaded on startup."
+msgstr "Плагины, перечисленные здесь, будут загружены при запуске."
+
+#: desktop/org.gnome.Geary.gschema.xml:122
+msgid "Whether we migrated the old settings"
+msgstr "Перенести ли старые настройки"
+
+#: desktop/org.gnome.Geary.gschema.xml:123
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
+"Значение \"false\", чтобы проверить старую схему “org.yorba.geary” и "
+"скопировать ее значения."
+
+#. Translators: In-app notification label, when
+#. the app had a problem pinning an otherwise
+#. untrusted TLS certificate
+#: src/client/accounts/accounts-editor.vala:208
+msgid "Failed to store certificate"
+msgstr "Не удалось сохранить сертификат"
+
+#. Translators: Label for adding an email account
+#. account for a generic IMAP service provider.
+#: src/client/accounts/accounts-editor-add-pane.vala:98
+msgid "All others"
+msgstr "Все остальные"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:185
+#: src/client/accounts/accounts-editor-servers-pane.vala:313
+msgid "Check your receiving login and password"
+msgstr "Проверьте свой логин и пароль для получения почты"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:200
+#: src/client/accounts/accounts-editor-servers-pane.vala:326
+msgid "Check your receiving server details"
+msgstr "Проверьте параметры сервера получения почты"
+
+#. Translators: In-app notification label
+#. There was an SMTP auth error, but IMAP already
+#. succeeded, so the user probably needs to
+#. specify custom creds here
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:222
+#: src/client/accounts/accounts-editor-servers-pane.vala:347
+msgid "Check your sending login and password"
+msgstr "Проверьте параметры сервера отправления почты"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:236
+#: src/client/accounts/accounts-editor-servers-pane.vala:360
+msgid "Check your sending server details"
+msgstr "Проверьте данные вашего отправляющего сервера почты"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:251
+msgid "Check your email address and password"
+msgstr "Проверьте свой адрес электронной почты и пароль"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:262
+msgid "Could not connect, check your network"
+msgstr "Не удалось подключиться, проверьте свою сеть"
+
+#. Translators: In-app notification label for a
+#. generic error creating an account
+#: src/client/accounts/accounts-editor-add-pane.vala:275
+msgid "An unexpected problem occurred"
+msgstr "Возникла неожиданная проблема"
+
+#. Translators: In-app notification label, the
+#. string substitution is a more detailed reason.
+#: src/client/accounts/accounts-editor-add-pane.vala:293
+#, c-format
+msgid "Account not created: %s"
+msgstr "Учетная запись не создана: %s"
+
+#. Translators: Label for the person's actual name when adding
+#. an account
+#: src/client/accounts/accounts-editor-add-pane.vala:573
+msgid "Your name"
+msgstr "Ваше имя"
+
+#. Translators: Label used for the address part of an
+#. email address when editing a user's sender address
+#. preferences for an account.
+#: src/client/accounts/accounts-editor-add-pane.vala:590
+#: src/client/accounts/accounts-editor-edit-pane.vala:527
+#| msgid "Email address:"
+msgid "Email address"
+msgstr "Адрес электронной почты"
+
+#. Translators: Placeholder for the default sender address
+#. when adding an account
+#. Translators: This is used as a placeholder for the
+#. address part of an email address when editing a user's
+#. sender address preferences for an account.
+#: src/client/accounts/accounts-editor-add-pane.vala:594
+#: src/client/accounts/accounts-editor-edit-pane.vala:493
+#| msgid "email example com"
+msgid "person example com"
+msgstr "person example com"
+
+#. Translators: Label for an IMAP/SMTP service login/user name
+#. when adding an account
+#. Translators: Label for the user's login name for an
+#. IMAP, SMTP, etc service
+#: src/client/accounts/accounts-editor-add-pane.vala:608
+#: src/client/accounts/accounts-editor-servers-pane.vala:881
+msgid "Login name"
+msgstr "Имя пользователя"
 
-#: src/client/accounts/account-dialog-add-edit-pane.vala:54
-#: src/client/components/stock.vala:31 ui/conversation-email-menus.ui:83
-msgid "_Save"
-msgstr "_Сохранить"
+#. Translators: Label for the user's password for an IMAP,
+#. SMTP, etc service
+#: src/client/accounts/accounts-editor-add-pane.vala:622
+#: src/client/accounts/accounts-editor-servers-pane.vala:1003
+#: ui/password-dialog.glade:98
+msgid "Password"
+msgstr "Пароль"
 
-#: src/client/accounts/account-dialog-add-edit-pane.vala:54
-#: src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_Добавить"
+#. Translators: Label for the IMAP server hostname when
+#. adding an account.
+#. Translators: This label describes the host name or IP
+#. address and port used by an account's IMAP service.
+#: src/client/accounts/accounts-editor-add-pane.vala:644
+#: src/client/accounts/accounts-editor-servers-pane.vala:725
+#| msgid "IMAP username"
+msgid "IMAP server"
+msgstr "Сервер IMAP"
+
+#. Translators: Placeholder for the IMAP server hostname
+#. when adding an account.
+#: src/client/accounts/accounts-editor-add-pane.vala:647
+msgid "imap.example.com"
+msgstr "imap.example.com"
+
+#. Translators: Label for the SMTP server hostname when
+#. adding an account.
+#. Translators: This label describes the host name or IP
+#. address and port used by an account's SMTP service.
+#: src/client/accounts/accounts-editor-add-pane.vala:653
+#: src/client/accounts/accounts-editor-servers-pane.vala:731
+#| msgid "SMTP username"
+msgid "SMTP server"
+msgstr "Сервер SMTP"
+
+#. Translators: Placeholder for the SMTP server hostname
+#. when adding an account.
+#: src/client/accounts/accounts-editor-add-pane.vala:656
+msgid "smtp.example.com"
+msgstr "smtp.example.com"
 
-#. reset/clear widgets
-#: src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:120
+#. This is the remove account button in the account settings.
+#: src/client/accounts/accounts-editor-edit-pane.vala:211
+#: ui/accounts_editor_edit_pane.ui:239
+#| msgid "Remove account"
+msgid "Remove Account"
+msgstr "Удалить Аккаунт"
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:219
 #, c-format
-msgid "Additional addresses for %s"
-msgstr "Дополнительные адреса для %s"
+#| msgid "Remove account"
+msgid "Remove Account: %s"
+msgstr "Удалить Аккаунт: %s"
 
-#. Sets min size.
-#: src/client/accounts/account-dialog.vala:28
-msgid "Accounts"
-msgstr "Учётные записи"
-
-#. 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.
-#.
-#. Page for adding or editing an account.
-#. / Placeholder text indicating that the user should type their first name and last name
-#: src/client/accounts/add-edit-page.vala:10
-msgid "First Last"
-msgstr "Имя Фамилия"
-
-#: src/client/accounts/add-edit-page.vala:240
-msgid "Welcome to Geary."
-msgstr "Добро пожаловать в Geary."
-
-#: src/client/accounts/add-edit-page.vala:240
-msgid "Enter your account information to get started."
-msgstr "Чтобы приступить к работе, введите информацию об учётной записи."
-
-#: src/client/accounts/add-edit-page.vala:260
+#: src/client/accounts/accounts-editor-edit-pane.vala:221
+msgid ""
+"This will remove it from Geary and delete locally cached email data from "
+"your computer. Nothing will be deleted from your service provider."
+msgstr ""
+"Это удалит его из Geary и удалит локально кэшированные данные электронной "
+"почты с вашего компьютера. У поставщика услуг ничего не будет удалено."
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:223
+#: src/client/components/stock.vala:19
+#: src/client/plugin/mail-merge/mail-merge.vala:392
+#: ui/password-dialog.glade:182
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#. Translators: Label in the account editor for the user's
+#. custom name for an account.
+#: src/client/accounts/accounts-editor-edit-pane.vala:289
+#| msgid "Accounts"
+msgid "Account name"
+msgstr "Имя аккаунта"
+
+#. Translators: Tooltip used to undo changing
+#. the name of an account. The string
+#. substitution is the old name of the
+#. account.
+#: src/client/accounts/accounts-editor-edit-pane.vala:330
+#, c-format
+msgid "Change account name back to “%s”"
+msgstr "Изменить имя аккаунта обратно на \"%s\""
+
+#. Translators: Tooltip for adding a new email sender/from
+#. address's address to an account
+#: src/client/accounts/accounts-editor-edit-pane.vala:354
+#| msgid "Remove email address"
+msgid "Add a new sender email address"
+msgstr "Добавить новый адрес электронной почты отправителя"
+
+#. Translators: Label used to indicate the user has
+#. provided no display name for one of their sender
+#. email addresses in their account settings.
+#: src/client/accounts/accounts-editor-edit-pane.vala:437
+#| msgid "Message not saved"
+msgid "Name not set"
+msgstr "Имя не установлено"
+
+#. Translators: This is used as a placeholder for the
+#. display name for an email address when editing a user's
+#. sender address preferences for an account.
+#: src/client/accounts/accounts-editor-edit-pane.vala:478
+msgid "Sender Name"
+msgstr "Имя Отправителя"
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:505
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "Удалить"
+
+#. Translators: Label used for the display name part of an
+#. email address when editing a user's sender address
+#. preferences for an account.
+#: src/client/accounts/accounts-editor-edit-pane.vala:520
+#| msgid "Username"
+msgid "Sender name"
+msgstr "Имя отправителя"
+
+#. Translators: Label used as the undo tooltip after adding an
+#. new sender email address to an account. The string
+#. substitution is the email address added.
+#: src/client/accounts/accounts-editor-edit-pane.vala:587
+#, c-format
+msgid "Remove “%s”"
+msgstr "Удалить “%s”"
+
+#. Translators: Label used as the undo tooltip after editing a
+#. sender address for an account. The string substitution is
+#. the email address edited.
+#: src/client/accounts/accounts-editor-edit-pane.vala:627
+#, c-format
+#| msgid "Unrecognized command line option “%s”\n"
+msgid "Undo changes to “%s”"
+msgstr "Отменить изменения в \"%s\""
+
+#. Translators: Label used as the undo tooltip after removing
+#. a sender address from an account. The string substitution
+#. is the email address edited.
+#: src/client/accounts/accounts-editor-edit-pane.vala:714
+#, c-format
+msgid "Add “%s” back"
+msgstr "Добавить \"%s\" обратно"
+
+#. Translators: Label used as the undo tooltip after removing
+#. a sender address from an account. The string substitution
+#. is the email address edited.
+#: src/client/accounts/accounts-editor-edit-pane.vala:756
+msgid "Undo signature changes"
+msgstr "Отменить изменения подписи"
+
+#. Translators: This label describes the account
+#. preference for the length of time (weeks, months or
+#. years) that past email should be downloaded.
+#: src/client/accounts/accounts-editor-edit-pane.vala:804
+#| msgid "_Download mail"
+msgid "Download mail"
+msgstr "Скачать почту"
+
+#. Translators: Tooltip for undoing a change
+#. to the length of time that past email
+#. should be downloaded for an account. The
+#. string substitution is the duration,
+#. e.g. "1 month back".
+#: src/client/accounts/accounts-editor-edit-pane.vala:836
+#, c-format
+msgid "Change download period back to: %s"
+msgstr "Изменить период загрузки обратно на: %s"
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:857
+msgid "Everything"
+msgstr "За всё время"
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:861
 msgid "2 weeks back"
 msgstr "За последние 2 недели"
 
-#. IDs are # of days
-#: src/client/accounts/add-edit-page.vala:261
+#: src/client/accounts/accounts-editor-edit-pane.vala:865
 msgid "1 month back"
 msgstr "За последний месяц"
 
-#: src/client/accounts/add-edit-page.vala:262
+#: src/client/accounts/accounts-editor-edit-pane.vala:869
 msgid "3 months back"
 msgstr "За последние 3 месяца"
 
-#: src/client/accounts/add-edit-page.vala:263
+#: src/client/accounts/accounts-editor-edit-pane.vala:873
 msgid "6 months back"
 msgstr "За последние 6 месяцев"
 
-#: src/client/accounts/add-edit-page.vala:264
+#: src/client/accounts/accounts-editor-edit-pane.vala:877
 msgid "1 year back"
 msgstr "За последний год"
 
-#: src/client/accounts/add-edit-page.vala:265
+#: src/client/accounts/accounts-editor-edit-pane.vala:881
 msgid "2 years back"
 msgstr "За последние 2 года"
 
-#: src/client/accounts/add-edit-page.vala:266
+#: src/client/accounts/accounts-editor-edit-pane.vala:885
 msgid "4 years back"
 msgstr "За последние 4 года"
 
-#. Separator
-#: src/client/accounts/add-edit-page.vala:268
-msgid "Everything"
-msgstr "За всё время"
-
-#: src/client/accounts/add-edit-page.vala:288
-msgid "Edit"
-msgstr "Правка"
-
-#: src/client/accounts/add-edit-page.vala:290
-msgid "Preview"
-msgstr "Предварительный просмотр"
-
-#: src/client/accounts/add-edit-page.vala:778
-msgid "Remem_ber passwords"
-msgstr "Зап_омнить пароли"
-
-#: src/client/accounts/add-edit-page.vala:785 ui/login.glade:233
-msgid "Remem_ber password"
-msgstr "За_помнить пароль"
-
-#: src/client/accounts/add-edit-page.vala:819
-msgid "Unable to validate:\n"
-msgstr "Не удалось подтвердить:\n"
-
-#: src/client/accounts/add-edit-page.vala:821
-msgid "        • Invalid account nickname.\n"
-msgstr "        • Неверный псевдоним учётной записи.\n"
-
-#: src/client/accounts/add-edit-page.vala:824
-msgid "        • Email address already added to Geary.\n"
-msgstr "        • Адрес электронной почты уже добавлен в Geary.\n"
+#: src/client/accounts/accounts-editor-edit-pane.vala:891
+#, c-format
+#| msgid "1 year back"
+msgid "%d day back"
+msgid_plural "%d days back"
+msgstr[0] "%d день назад"
+msgstr[1] "%d дня назад"
+msgstr[2] "%d дней назад"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:246
+#: src/client/application/application-main-window.vala:2270
+#| msgid "_Undo"
+msgid "Undo"
+msgstr "Отменить"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:255
+#: src/client/application/application-main-window.vala:2253
+#| msgid "_Redo"
+msgid "Redo"
+msgstr "Повторить"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:349
+#: src/client/accounts/accounts-editor-list-pane.vala:445
+#: src/client/accounts/accounts-editor-row.vala:279
+msgid "Gmail"
+msgstr "Gmail"
 
-#: src/client/accounts/add-edit-page.vala:828
-msgid "        • IMAP connection error.\n"
-msgstr "        • Ошибка подключения к IMAP.\n"
+#: src/client/accounts/accounts-editor-list-pane.vala:353
+#: src/client/accounts/accounts-editor-list-pane.vala:449
+#: src/client/accounts/accounts-editor-row.vala:283
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: src/client/accounts/add-edit-page.vala:831
-msgid "        • IMAP username or password incorrect.\n"
-msgstr "        • Неверные имя пользователя или пароль IMAP.\n"
+#: src/client/accounts/accounts-editor-list-pane.vala:357
+#: src/client/accounts/accounts-editor-list-pane.vala:453
+#: src/client/accounts/accounts-editor-row.vala:287
+#| msgid "Yahoo! Mail"
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#. Translators: Tooltip for accounts that have been
+#. loaded but disabled by the user.
+#: src/client/accounts/accounts-editor-list-pane.vala:379
+msgid "This account has been disabled"
+msgstr "Этот аккаунт был отключен"
+
+#. Translators: Tooltip for accounts that have been
+#. loaded but because of some error are not able to be
+#. used.
+#: src/client/accounts/accounts-editor-list-pane.vala:388
+#| msgid "Geary has encountered a problem"
+msgid "This account has encountered a problem and is unavailable"
+msgstr "Этот аккаунт столкнулся с проблемой и недоступен"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:457
+msgid "Other email providers"
+msgstr "Другие поставщики услуг электронной почты"
+
+#. Translators: Notification shown after removing an
+#. account. The string substitution is the name of the
+#. account.
+#: src/client/accounts/accounts-editor-list-pane.vala:563
+#, c-format
+msgid "Account “%s” removed"
+msgstr "Аккаунт “%s” удален"
 
-#: src/client/accounts/add-edit-page.vala:834
-msgid "        • SMTP connection error.\n"
-msgstr "        • Ошибка подключения к SMTP.\n"
+#. Translators: Notification shown after removing an account
+#. is undone. The string substitution is the name of the
+#. account.
+#: src/client/accounts/accounts-editor-list-pane.vala:570
+#, c-format
+msgid "Account “%s” restored"
+msgstr "Аккаунт “%s” восстановлен"
+
+#. Translators: Tooltip for dragging list items
+#: src/client/accounts/accounts-editor-row.vala:50
+msgid "Drag to move this item"
+msgstr "Перетащите, чтобы переместить этот элемент"
+
+#. Translators: Label describes the service provider
+#. hosting the email account, e.g. Gmail, Yahoo, or some
+#. other generic IMAP service.
+#: src/client/accounts/accounts-editor-row.vala:299
+msgid "Service provider"
+msgstr "Поставщик услуг"
+
+#. Translators: This label describes what form of transport
+#. security (TLS, StartTLS, etc) used by an account's IMAP or SMTP
+#. service.
+#: src/client/accounts/accounts-editor-row.vala:473
+msgid "Connection security"
+msgstr "Безопасность подключения"
+
+#. Translators: Label used when no auth scheme is used
+#. by an account's IMAP or SMTP service.
+#: src/client/accounts/accounts-editor-row.vala:484
+#: src/client/accounts/accounts-editor-servers-pane.vala:752
+#: src/client/accounts/accounts-editor-servers-pane.vala:967
+msgid "None"
+msgstr "Нет"
 
-#: src/client/accounts/add-edit-page.vala:837
-msgid "        • SMTP username or password incorrect.\n"
-msgstr "        • Неверные имя пользователя или пароль SMTP.\n"
+#: src/client/accounts/accounts-editor-row.vala:491
+#| msgctxt "shortcut window"
+#| msgid "Star"
+msgid "StartTLS"
+msgstr "StartTLS"
+
+#: src/client/accounts/accounts-editor-row.vala:498
+#| msgid "SSL/TLS"
+msgid "TLS"
+msgstr "TLS"
+
+#. Translators: Label for source of SMTP authentication
+#. credentials (none, use IMAP, custom) when adding a new
+#. account
+#. Translators: An info bar button label
+#: src/client/accounts/accounts-editor-row.vala:539
+#: src/client/application/application-main-window.vala:650
+msgid "Login"
+msgstr "Логин"
+
+#. Translators: ComboBox value for source of SMTP
+#. authentication credentials (none) when adding a new
+#. account
+#: src/client/accounts/accounts-editor-row.vala:546
+msgid "No login needed"
+msgstr "Вход в систему не требуется"
+
+#. Translators: ComboBox value for source of SMTP
+#. authentication credentials (use IMAP) when adding a new
+#. account
+#: src/client/accounts/accounts-editor-row.vala:554
+msgid "Use same login as receiving"
+msgstr "Использовать тот же логин, что и для получения почты"
+
+#. Translators: ComboBox value for source of SMTP
+#. authentication credentials (custom) when adding a new
+#. account
+#: src/client/accounts/accounts-editor-row.vala:562
+msgid "Use a different login"
+msgstr "Использовать другой логин"
+
+#. Translators: In-app notification label, the
+#. string substitution is a more detailed reason.
+#: src/client/accounts/accounts-editor-servers-pane.vala:374
+#, c-format
+msgid "Account not updated: %s"
+msgstr "Аккаунт не обновлен: %s"
+
+#. Translators: This label describes the program that
+#. created the account, e.g. an SSO service like GOA, or
+#. locally by Geary.
+#: src/client/accounts/accounts-editor-servers-pane.vala:537
+#| msgid "Accounts"
+msgid "Account source"
+msgstr "Источник аккаунта"
+
+#: src/client/accounts/accounts-editor-servers-pane.vala:549
+msgid "GNOME Online Accounts"
+msgstr "Онлайн-аккаунты GNOME"
+
+#. Translators: This label describes an account
+#. preference.
+#: src/client/accounts/accounts-editor-servers-pane.vala:608
+#| msgid "Save dra_fts on server"
+msgid "Save draft email on server"
+msgstr "Сохранить черновик электронной почты на сервере"
+
+#. Translators: This label describes an account
+#. preference.
+#: src/client/accounts/accounts-editor-servers-pane.vala:663
+#| msgid "_Save sent mail"
+msgid "Save sent email on server"
+msgstr "Сохранить отправленную электронную почту на сервере"
+
+#. Add a suffix for OAuth2 auth so people know they
+#. shouldn't expect to be prompted for a password
+#. Translators: Label used when an account's IMAP or
+#. SMTP service uses OAuth2. The string replacement is
+#. the service's login name.
+#: src/client/accounts/accounts-editor-servers-pane.vala:953
+#, c-format
+msgid "%s using OAuth2"
+msgstr "%s с использованием OAuth2"
+
+#: src/client/accounts/accounts-editor-servers-pane.vala:963
+msgid "Use receiving server login"
+msgstr "Использовать логин сервера получения почты"
+
+#. Translators: File name used in save chooser when saving
+#. attachments that do not otherwise have a name.
+#: src/client/application/application-attachment-manager.vala:21
+msgid "Untitled"
+msgstr "Без названия"
+
+#. / Translators: Dialog primary label when prompting to
+#. / overwrite a file. The string substitution is the file'sx
+#. / name.
+#: src/client/application/application-attachment-manager.vala:222
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Файл с именем \"%s\" уже существует. Заменить его?"
 
-#: src/client/accounts/add-edit-page.vala:841
-msgid "        • Connection error.\n"
-msgstr "        • Ошибка подключения.\n"
+#. / Translators: Dialog secondary label when prompting to
+#. / overwrite a file. The string substitution is the parent
+#. / folder's name.
+#: src/client/application/application-attachment-manager.vala:229
+#, c-format
+msgid ""
+"The file already exists in “%s”.  Replacing it will overwrite its contents."
+msgstr ""
+"Файл уже существует в \"%s\". Его замена приведёт к полной перезаписи его "
+"содержимого."
 
-#: src/client/accounts/add-edit-page.vala:845
-msgid "        • Username or password incorrect.\n"
-msgstr "        • Неверные имя пользователя или пароль.\n"
+#: src/client/application/application-attachment-manager.vala:236
+msgid "_Replace"
+msgstr "_Заменить"
 
-#: src/client/application/geary-application.vala:22
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Авторское право © 2016 Software Freedom Conservancy Inc."
+#: src/client/application/application-client.vala:34
+#| msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgid "Copyright © 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright © 2016 Software Freedom Conservancy Inc."
 
-#: src/client/application/geary-application.vala:23
-#| msgid "Copyright 2016-2017 Geary Development Team."
-msgid "Copyright 2016-2018 Geary Development Team."
-msgstr "Авторское право © 2016-2018 Geary Development Team."
+#: src/client/application/application-client.vala:35
+#| msgid "Copyright 2016-2018 Geary Development Team."
+msgid "Copyright © 2016-2021 Geary Development Team."
+msgstr "Copyright © 2016-2021 Geary Development Team."
 
-#: src/client/application/geary-application.vala:25
+#: src/client/application/application-client.vala:37
 msgid "Visit the Geary web site"
 msgstr "Посетить веб-сайт Geary"
 
-#: src/client/application/geary-application.vala:416
-#, 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-application.vala:420
-msgid "translator-credits"
-msgstr "Stas Solovey <whats_up tut by>, 2015-2018."
+#. / Command line option
+#: src/client/application/application-client.vala:102
+msgid "Print debug logging"
+msgstr "Печать журнала отладки"
 
-#: src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Запускать Geary свёрнутым"
+#. / Command line option
+#: src/client/application/application-client.vala:105
+#| msgid "Start Geary with hidden main window"
+msgid "Start with the main window hidden (deprecated)"
+msgstr "Запуск со скрытым главным окном (устаревшая версия)"
 
-#: src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Выводить отладочную информацию"
+#. / Command line option
+#: src/client/application/application-client.vala:108
+msgid "Enable WebKitGTK Inspector in web views"
+msgstr "Включить инспектор WebKitGTK в веб-просмотрах"
 
-#: src/client/application/geary-args.vala:12
+#. / Command line option
+#: src/client/application/application-client.vala:111
 msgid "Log conversation monitoring"
 msgstr "Записывать мониторинг бесед"
 
 # What is "deserialization"?
-#: src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Записывать десериализацию сети"
-
-#: src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Записывать сетевую активность"
-
-#. / The IMAP replay queue is how changes on the server are replicated on the client.
-#. / It could also be called the IMAP events queue.
-#: src/client/application/geary-args.vala:17
+#. / Command line option
+#: src/client/application/application-client.vala:114
+#| msgid "Log network deserialization"
+msgid "Log IMAP network deserialization"
+msgstr "Записывать десериализацию сети IMAP"
+
+#. / Command line option. "Normalization" can also be called
+#. / "synchronization".
+#: src/client/application/application-client.vala:118
+msgid "Log folder normalization"
+msgstr "Записывать нормализацию папки"
+
+#. / Command line option
+#: src/client/application/application-client.vala:121
+#| msgid "Log network activity"
+msgid "Log IMAP network activity"
+msgstr "Записывать активность сети IMAP"
+
+#. / Command line option. 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/application-client.vala:126
 msgid "Log IMAP replay queue"
-msgstr "Записывать ответ IMAP"
+msgstr "Записывать очередь воспроизведения IMAP"
 
-#. / Serialization is how commands and responses are converted into a stream of bytes for
-#. / network transmission
-#: src/client/application/geary-args.vala:20
-msgid "Log network serialization"
-msgstr "Записывать сериализацию сети"
+#. / Command line option
+#: src/client/application/application-client.vala:129
+#| msgid "Log network activity"
+msgid "Log SMTP network activity"
+msgstr "Записывать активность сети SMTP"
 
-#: src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Записывать периодическую активность"
-
-#: src/client/application/geary-args.vala:22
+#. / Command line option
+#: src/client/application/application-client.vala:132
 msgid "Log database queries (generates lots of messages)"
 msgstr "Записывать запросы базы данных (создаёт множество сообщений)"
 
-#. / "Normalization" can also be called "synchronization"
-#: src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Записывать синхронизацию папки"
-
-#: src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "Разрешить проверку WebView"
-
-#: src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "Отозвать все сертификаты серверов с предупреждениями TLS"
-
-#: src/client/application/geary-args.vala:27
+#. / Command line option
+#: src/client/application/application-client.vala:135
 msgid "Perform a graceful quit"
 msgstr "Выполнить правильный выход"
 
-#: src/client/application/geary-args.vala:28
-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:53
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Используйте %s для открытия нового окна редактора"
-
-#: src/client/application/geary-args.vala:56
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Комментарии, пожелания и найденные ошибки отправляйте:"
-
-#. i18n: Command line arguments are invalid
-#: src/client/application/geary-args.vala:63
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Не удалось разобрать параметры командной строки: %s\n"
+#: src/client/application/application-client.vala:137
+#| msgid "Use %s to open a new composer window"
+msgid "Open a new window"
+msgstr "Открыть новое окно"
 
-#: src/client/application/geary-args.vala:74
-#, c-format
-msgid "Unrecognized command line option “%s”\n"
-msgstr "Неизвестный параметр командной строки «%s»\n"
+#. / Command line option
+#: src/client/application/application-client.vala:140
+#| msgid "Revoke all server certificates with TLS warnings"
+msgid "Revoke all pinned TLS server certificates"
+msgstr "Отозвать все прикрепленные сертификаты TLS-сервера"
 
-#: src/client/application/geary-controller.vala:719
-msgid "Unable to store server trust exception"
-msgstr "Не удалось добавить исключение безопасности сервера"
+#. / Command line option
+#: src/client/application/application-client.vala:143
+msgid "Display program version"
+msgstr "Показать версию приложения"
 
-#: src/client/application/geary-controller.vala:970
-msgid "Your settings are insecure"
-msgstr "Параметры небезопасны"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:275
+#| msgid "Mark conversation"
+msgid "Geary version"
+msgstr "Версия Geary"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:277
+msgid "Geary revision"
+msgstr "Ревизия Geary"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:279
+msgid "GTK version"
+msgstr "Версия GTK"
+
+#. / Applciation runtime information label
+#: src/client/application/application-client.vala:286
+msgid "GLib version"
+msgstr "Версия GLib"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:293
+msgid "WebKitGTK version"
+msgstr "Версия WebKitGTK"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:300
+msgid "Desktop environment"
+msgstr "Среда рабочего стола"
 
-#: src/client/application/geary-controller.vala:971
-msgid ""
-"Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
-"username and password could be read by another person on the network.  Are "
-"you sure you want to do this?"
-msgstr ""
-"В параметрах IMAP или SMTP не указано SSL или TLS шифрование. Это означает, "
-"что ваши имя пользователя и пароль могут быть перехвачены сторонними лицами. "
-"Уверены, что хотите продолжить?"
+#. Translators: This is the file type displayed for
+#. attachments with unknown file types.
+#: src/client/application/application-client.vala:302
+#: src/client/application/application-client.vala:308
+#: src/client/application/application-client.vala:314
+#: src/client/components/components-attachment-pane.vala:88
+msgid "Unknown"
+msgstr "Неизвестный"
 
-#: src/client/application/geary-controller.vala:972
-msgid "Co_ntinue"
-msgstr "_Продолжить"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:306
+msgid "Distribution name"
+msgstr "Название дистрибутива"
 
-#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: src/client/application/geary-controller.vala:1076
-#: src/client/components/status-bar.vala:29
-msgid "Error sending email"
-msgstr "Ошибка отправки эл. почты"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:312
+msgid "Distribution release"
+msgstr "Релиз дистрибутива"
 
-#: src/client/application/geary-controller.vala:1077
-msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
-msgstr ""
-"В Geary произошла ошибка при отправке электронной почты. Если проблема не "
-"устраняется, вручную удалите почту из папки «Исходящие»."
+#. / Application runtime information label
+#: src/client/application/application-client.vala:318
+msgid "Installation prefix"
+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:1081
-#: src/client/components/status-bar.vala:33
-msgid "Error saving sent mail"
-msgstr "Ошибка сохранения отправленной почты"
+#: src/client/application/application-client.vala:587
+#, c-format
+msgid "About %s"
+msgstr "О программе %s"
 
-#: src/client/application/geary-controller.vala:1082
-msgid ""
-"Geary encountered an error saving a sent message to Sent Mail.  The message "
-"will stay in your Outbox folder until you delete it."
+#. 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/application-client.vala:591
+msgid "translator-credits"
 msgstr ""
-"В Geary произошла ошибка при сохранении отправленного сообщения в папку "
-"«Отправленные». Сообщение будет в папке «Исходящие» пока вы не удалите его."
+"Alex <atrigub gmail com>, 2013\n"
+"RealRedFox <redfox front ru>, 2013\n"
+"Pentagrammer <pent spb gmail com>, 2013\n"
+"mynameisdaniil <sobol daniil gmail com>, 2012\n"
+"Aleksandr Stepanov <alex eri ya ru>, 2015.\n"
+"Stas Solovey <whats_up tut by>, 2015, 2016, 2018.\n"
+"Aleksandr Melman <Alexmelman88 gmail com>, 2021"
+
+#. / Warning printed to the console when a deprecated
+#. / command line option is used.
+#: src/client/application/application-client.vala:1101
+msgid "The `--hidden` option is deprecated and will be removed in the future."
+msgstr "Опция `--hidden` устарела и в будущем будет удалена."
+
+#. / Command line warning, string substitution
+#. / is the given argument
+#: src/client/application/application-client.vala:1134
+#, c-format
+#| msgid "Unrecognized command line option “%s”\n"
+msgid "Unrecognised program argument: “%s”"
+msgstr "Неопознанный аргумент программы: “%s”"
 
-#: src/client/application/geary-controller.vala:1149
-msgid "Labels"
-msgstr "Метки"
+#. / Notification title.
+#: src/client/application/application-controller.vala:496
+#, c-format
+msgid "A problem occurred sending email for %s"
+msgstr "Возникла проблема с отправкой электронной почты для %s"
+
+#. / Notification body
+#: src/client/application/application-controller.vala:500
+msgid "Email will not be sent until re-connected"
+msgstr "Электронная почта не будет отправлена до повторного подключения"
+
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:599
+#| msgid "Conversation Shortcuts"
+msgid "Conversation marked"
+msgid_plural "Conversations marked"
+msgstr[0] "Беседа отмечена"
+msgstr[1] "Беседы отмечены"
+msgstr[2] "Бесед отмечено"
+
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:605
+#| msgid "No conversations found"
+msgid "Conversation un-marked"
+msgid_plural "Conversations un-marked"
+msgstr[0] "Беседа не отмечена"
+msgstr[1] "Беседы не отмечены"
+msgstr[2] "Бесед не отмечено"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:631
+#: src/client/application/application-controller.vala:715
+#, c-format
+#| msgid "Conversation Shortcuts"
+msgid "Conversation moved to %s"
+msgid_plural "Conversations moved to %s"
+msgstr[0] "Беседа переместилась в %s"
+msgstr[1] "Беседы переместились в %s"
+msgstr[2] "Бесед переместилось в %s"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the source folder.
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:639
+#: src/client/application/application-controller.vala:661
+#, c-format
+#| msgid "Conversation Shortcuts"
+msgid "Conversation restored to %s"
+msgid_plural "Conversations restored to %s"
+msgstr[0] "Беседа восстановлена в %s"
+msgstr[1] "Беседы восстановлены в %s"
+msgstr[2] "Бесед восстановлено в %s"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:682
+#| msgid "Conversation Shortcuts"
+msgid "Conversation archived"
+msgid_plural "Conversations archived"
+msgstr[0] "Беседа заархивирована"
+msgstr[1] "Беседы заархивированы"
+msgstr[2] "Бесед заархивировано"
+
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:738
+#, c-format
+#| msgid "Message not saved"
+msgid "Message restored to %s"
+msgid_plural "Messages restored to %s"
+msgstr[0] "Сообщение восстановлено в %s"
+msgstr[1] "Сообщения восстановлены в %s"
+msgstr[2] "Сообщений восстановлено в %s"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:759
+#| msgid "Message not saved"
+msgid "Message archived"
+msgid_plural "Messages archived"
+msgstr[0] "Сообщение заархивировано"
+msgstr[1] "Сообщения заархивированы"
+msgstr[2] "Сообщений заархивировано"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:794
+#, c-format
+#| msgid "Message not saved"
+msgid "Message moved to %s"
+msgid_plural "Messages moved to %s"
+msgstr[0] "Сообщение перемещено в %s"
+msgstr[1] "Сообщения перемещены в %s"
+msgstr[2] "Сообщений перемещено в %s"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:822
+#, c-format
+#| msgid "No conversations selected"
+msgid "Conversation labelled as %s"
+msgid_plural "Conversations labelled as %s"
+msgstr[0] "Беседа помечена как %s"
+msgstr[1] "Беседы помечены как %s"
+msgstr[2] "Бесед помечено как %s"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:830
+#, c-format
+msgid "Conversation un-labelled as %s"
+msgid_plural "Conversations un-labelled as %s"
+msgstr[0] "Беседа не помечена как %s"
+msgstr[1] "Беседы не помечены как %s"
+msgstr[2] "Бесед не помечено как %s"
 
-#. 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:1161
+#: src/client/application/application-controller.vala:1337
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Не удалось открыть базу данных для %s"
 
-#: src/client/application/geary-controller.vala:1162
+#: src/client/application/application-controller.vala:1338
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -648,540 +1180,601 @@ msgstr ""
 "Пересоздание базы данных уничтожит все локальные письма и их вложения. "
 "<b>Операция не затронет почту, хранящуюся на сервере.</b>"
 
-#: src/client/application/geary-controller.vala:1164
+#: src/client/application/application-controller.vala:1340
 msgid "_Rebuild"
-msgstr "Пересоздать"
+msgstr "_Пересобрать"
 
-#: src/client/application/geary-controller.vala:1164
+#: src/client/application/application-controller.vala:1340
 msgid "E_xit"
-msgstr "_Завершить"
+msgstr "В_ыйти"
 
-#: src/client/application/geary-controller.vala:1173
+#: src/client/application/application-controller.vala:1350
 #, c-format
 msgid "Unable to rebuild database for “%s”"
-msgstr "Не удалось пересоздать базу данных для «%s»"
+msgstr "Не удалось пересобрать базу данных для “%s”"
 
-#: src/client/application/geary-controller.vala:1174
+#: src/client/application/application-controller.vala:1351
 #, c-format
 msgid ""
 "Error during rebuild:\n"
 "\n"
 "%s"
 msgstr ""
-"Ошибка пересоздания:\n"
+"Ошибка пересборки:\n"
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: src/client/application/geary-controller.vala:1196
-#: src/client/application/geary-controller.vala:1206
-#: src/client/application/geary-controller.vala:1217
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:1518
 #, c-format
-msgid "Unable to open local mailbox for %s"
-msgstr "Не удалось открыть локальный почтовый ящик для %s"
+msgid "Email sent to %s"
+msgstr "Письмо отправлено до %s"
 
-#: src/client/application/geary-controller.vala:1197
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2512
 #, c-format
-msgid ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to a file permissions problem.\n"
-"\n"
-"Please check that you have read/write permissions for all files in this "
-"directory:\n"
-"\n"
-"%s"
-msgstr ""
-"Произошла ошибка при открытии локальной базы данных почты для этой учётной "
-"записи. Возможно, это произошло из-за проблем с правами доступа к файлу.\n"
-"\n"
-"Проверьте наличие прав чтение/запись для всех файлов в данном каталоге:\n"
-"\n"
-"%s"
-
-#: src/client/application/geary-controller.vala:1207
-msgid ""
-"The version number of the local mail database is formatted for a newer "
-"version of Geary. Unfortunately, the database cannot be “rolled back” to "
-"work with this version of Geary.\n"
-"\n"
-"Please install the latest version of Geary and try again."
-msgstr ""
-"Версия локальной базы данных почты имеет формат более новой версии Geary. К "
-"сожалению, невозможно произвести изменение базы данных для работы с этой "
-"версией Geary.\n"
-"\n"
-"Установите последнюю версию Geary и попробуйте снова."
+msgid "Email to %s queued for delivery"
+msgstr "Письмо до %s поставлено в очередь на отправку"
 
-#: src/client/application/geary-controller.vala:1218
-msgid ""
-"There was an error opening the local account. This is probably due to "
-"connectivity issues.\n"
-"\n"
-"Please check your network connection and restart Geary."
-msgstr ""
-"Произошла ошибка при открытии локальной учётной записи. Возможно, это "
-"произошло из-за проблем с подключением.\n"
-"\n"
-"Проверьте подключение к сети и перезапустите Geary."
-
-#: src/client/application/geary-controller.vala:2036
-msgid "Undo move (Ctrl+Z)"
-msgstr "Отменить перемещение (Ctrl+Z)"
-
-#: src/client/application/geary-controller.vala:2046
-msgid "Are you sure you want to open these attachments?"
-msgstr "Действительно хотите открыть эти вложения?"
-
-#: src/client/application/geary-controller.vala:2047
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
-msgstr ""
-"Вложения при открытии могут нанести ущерб системе. Открывайте вложения "
-"только от надёжных источников."
-
-#: src/client/application/geary-controller.vala:2048
-msgid "Don’t _ask me again"
-msgstr "Не _спрашивать снова"
-
-#: src/client/application/geary-controller.vala:2144
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2576
 #, c-format
-msgid "A file named “%s” already exists.  Do you want to replace it?"
-msgstr "Файл с именем «%s» уже существует. Заменить его?"
-
-#: src/client/application/geary-controller.vala:2146
+msgid "Email to %s saved"
+msgstr "Письмо до %s сохранено"
+
+#. / Translators: A label for an in-app notification.
+#: src/client/application/application-controller.vala:2591
+#: src/client/application/application-controller.vala:2649
+msgid "Composer could not be restored"
+msgstr "Невозможно восстановить содержимое редактора"
+
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2634
 #, c-format
-msgid ""
-"The file already exists in “%s”.  Replacing it will overwrite its contents."
+msgid "Email to %s discarded"
+msgstr "Письмо до %s отклонено"
+
+#. / Translators: Label for account database upgrade dialog
+#: src/client/application/application-database-manager.vala:74
+#| msgid "Geary update in progress…"
+msgid "Account update in progress"
+msgstr "Выполняется обновление аккаунта"
+
+#. / Translators: Window title for account database upgrade
+#. / dialog
+#: src/client/application/application-database-manager.vala:80
+#| msgid "Accounts"
+msgid "Account update"
+msgstr "Обновление аккаунта"
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:636
+msgid "Working offline"
+msgstr "Работа в автономном режиме"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:638
+msgid "You will not be able to send or receive email until re-connected."
 msgstr ""
-"Файл уже существует в «%s». Его замена приведёт к полной перезаписи его "
-"содержимого."
-
-#: src/client/application/geary-controller.vala:2149
-msgid "_Replace"
-msgstr "_Заменить"
-
-#: src/client/application/geary-controller.vala:2389
-msgid "Close the draft message?"
-msgid_plural "Close all draft messages?"
-msgstr[0] "Закрыть черновик?"
-msgstr[1] "Закрыть черновики?"
-msgstr[2] "Закрыть черновики?"
+"Вы не сможете отправлять или получать электронную почту до повторного "
+"подключения."
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:645
+msgid "Login problem"
+msgstr "Проблема с входом в систему"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:647
+msgid "An account has reported an incorrect login or password."
+msgstr "Аккаунт сообщил о неверном логине или пароле."
+
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:654
+#| msgid "Retry receiving email, you will be prompted for a password"
+msgid "Retry login, you will be prompted for your password"
+msgstr "Повторите попытку входа, вам будет предложено ввести пароль"
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:661
+msgid "Security problem"
+msgstr "Проблема безопасности"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:663
+msgid "An account has reported an untrusted server."
+msgstr "Аккаунт сообщил о ненадежном сервере."
+
+#. Translators: An info bar button label
+#: src/client/application/application-main-window.vala:666
+msgid "Check"
+msgstr "Проверить"
+
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:670
+msgid "Check the security details for the connection"
+msgstr "Проверить сведения о безопасности для подключения"
+
+#. / Translators: Main window title, first string
+#. / substitution being the currently selected folder name,
+#. / the second being the selected account name.
+#: src/client/application/application-main-window.vala:713
+#, c-format
+msgid "%s — %s"
+msgstr "%s — %s"
+
+#. Translators: The name of the folder group containing
+#. folders created by people (as opposed to special-use
+#. folders)
+#: src/client/application/application-main-window.vala:1103
+#: src/client/folder-list/folder-list-account-branch.vala:46
+msgid "Labels"
+msgstr "Метки"
 
-#: src/client/application/geary-controller.vala:2515
+#: src/client/application/application-main-window.vala:1432
 #, c-format
 msgid "Empty all email from your %s folder?"
-msgstr "Очистить все письма папки %s?"
+msgstr "Очистить все письма из папки %s?"
 
-#: src/client/application/geary-controller.vala:2516
+#: src/client/application/application-main-window.vala:1433
 msgid "This removes the email from Geary and your email server."
-msgstr "Удаляет все письма из Geary и почтового сервера."
+msgstr ""
+"Это приведет к удалению электронной почты с Geary и вашего почтового сервера."
 
-#: src/client/application/geary-controller.vala:2517
+#: src/client/application/application-main-window.vala:1434
 msgid "This cannot be undone."
 msgstr "Это не может быть отменено."
 
-#: src/client/application/geary-controller.vala:2518
+#: src/client/application/application-main-window.vala:1435
 #, c-format
 msgid "Empty %s"
 msgstr "Очистить %s"
 
-#: src/client/application/geary-controller.vala:2535
-#, c-format
-msgid "Error emptying %s"
-msgstr "Ошибка очистки %s"
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1492
+#| msgid "Do you want to permanently delete this message?"
+#| msgid_plural "Do you want to permanently delete these messages?"
+msgid "Do you want to permanently delete this conversation?"
+msgid_plural "Do you want to permanently delete these conversations?"
+msgstr[0] "Ты хочешь навсегда удалить эту беседу?"
+msgstr[1] "Ты хочешь навсегда удалить эти беседы?"
+msgstr[2] "Ты хочешь навсегда удалить этих бесед?"
+
+#: src/client/application/application-main-window.vala:1497
+#: src/client/application/application-main-window.vala:1512
+msgid "Delete"
+msgstr "Удалить"
 
-#: src/client/application/geary-controller.vala:2567
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1507
 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:2569
-msgid "Delete"
-msgstr "_Удалить"
-
-#: src/client/application/geary-controller.vala:2583
-msgid "Undo trash (Ctrl+Z)"
-msgstr "Отменить перемещение в корзину (Ctrl+Z)"
-
-#: src/client/application/geary-controller.vala:2633
-msgid "Undo archive (Ctrl+Z)"
-msgstr "Отменить архивирование (Ctrl+Z)"
+msgstr[0] "Ты хочешь навсегда удалить это сообщение?"
+msgstr[1] "Ты хочешь навсегда удалить эти сообщения?"
+msgstr[2] "Ты хочешь навсегда удалить этих сообщений?"
 
-#: src/client/application/geary-controller.vala:2678
-msgid "Undo (Ctrl+Z)"
-msgstr "Отменить (Ctrl+Z)"
-
-#. Translators: The label for an in-app notification. The
-#. string substitution is a list of recipients of the email.
-#: src/client/application/geary-controller.vala:2755
+#: src/client/application/application-main-window.vala:1804
 #, c-format
-msgid "Successfully sent mail to %s."
-msgstr "Письмо успешно отправлено %s."
-
-#: src/client/application/geary-controller.vala:2836
-msgid "Failed to open default text editor."
-msgstr "Не удалось запустить текстовый редактор по-умолчанию."
-
-#. Tooltips
-#: src/client/components/main-toolbar.vala:69
-msgid "Delete conversation (Shift+Delete)"
-msgstr "Удалить беседу (Shift+Delete)"
-
-#: src/client/components/main-toolbar.vala:70
-msgid "Delete conversations (Shift+Delete)"
-msgstr "Удалить беседы (Shift+Delete)"
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: src/client/components/main-toolbar.vala:71
-msgid "Move conversation to Trash (Delete, Backspace)"
-msgstr "Переместить беседу в корзину (Delete, Backspace)"
+#. Translators: The first argument will be a
+#. description of the document type, the second will
+#. be a human-friendly size string. For example:
+#. Document (100.9MB)
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: src/client/components/components-attachment-pane.vala:104
+#: src/client/composer/composer-widget.vala:1870
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: src/client/components/main-toolbar.vala:72
-msgid "Move conversations to Trash (Delete, Backspace)"
-msgstr "Переместить беседы в корзину (Delete, Backspace)"
+#: src/client/components/components-attachment-pane.vala:373
+msgid "Are you sure you want to open these attachments?"
+msgstr "Действительно хотите открыть эти вложения?"
 
-#: src/client/components/main-toolbar.vala:73
-msgid "Archive conversation (A)"
-msgstr "Архивировать беседу (A)"
+#: src/client/components/components-attachment-pane.vala:374
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
+"Вложения при открытии могут нанести ущерб системе. Открывайте вложения "
+"только от надёжных источников."
 
-#: src/client/components/main-toolbar.vala:74
-msgid "Archive conversations (A)"
-msgstr "Архивировать беседы (A)"
+#: src/client/components/components-attachment-pane.vala:375
+msgid "Don’t _ask me again"
+msgstr "Не _спрашивать снова"
 
-#: src/client/components/main-toolbar.vala:75
+#: src/client/components/components-conversation-actions.vala:97
+#| msgid "Mark conversation"
 msgid "Mark conversation"
-msgstr "Отметить беседу"
+msgid_plural "Mark conversations"
+msgstr[0] "Отметить беседу"
+msgstr[1] "Отметить беседы"
+msgstr[2] "Отметить бесед"
 
-#: src/client/components/main-toolbar.vala:76
-msgid "Mark conversations"
-msgstr "Отметить беседы"
-
-#: src/client/components/main-toolbar.vala:77
+#: src/client/components/components-conversation-actions.vala:102
+#| msgid "Add label to conversation"
 msgid "Add label to conversation"
-msgstr "Добавить метку беседе"
+msgid_plural "Add label to conversations"
+msgstr[0] "Добавить метку беседе"
+msgstr[1] "Добавить метку беседам"
+msgstr[2] "Добавить метку беседам"
 
-#: src/client/components/main-toolbar.vala:78
-msgid "Add label to conversations"
-msgstr "Добавить метку беседам"
-
-#: src/client/components/main-toolbar.vala:79
+#: src/client/components/components-conversation-actions.vala:107
+#| msgid "Move conversation"
 msgid "Move conversation"
-msgstr "Переместить беседу"
-
-#: src/client/components/main-toolbar.vala:80
-msgid "Move conversations"
-msgstr "Переместить беседы"
+msgid_plural "Move conversations"
+msgstr[0] "Переместить беседу"
+msgstr[1] "Переместить беседы"
+msgstr[2] "Переместить бесед"
+
+#: src/client/components/components-conversation-actions.vala:112
+#: src/client/conversation-list/conversation-list-view.vala:446
+#| msgid "Archive conversation (A)"
+msgid "Archive conversation"
+msgid_plural "Archive conversations"
+msgstr[0] "Архивировать беседу"
+msgstr[1] "Архивировать беседы"
+msgstr[2] "Архивировать бесед"
+
+#: src/client/components/components-conversation-actions.vala:123
+#| msgid "Move conversations"
+msgid "Move conversation to Trash"
+msgid_plural "Move conversations to Trash"
+msgstr[0] "Переместить беседу в Kорзину"
+msgstr[1] "Переместить беседы в Корзину"
+msgstr[2] "Переместить бесед в Корзину"
+
+#: src/client/components/components-conversation-actions.vala:133
+#| msgid "Delete conversation"
+msgid "Delete conversation"
+msgid_plural "Delete conversations"
+msgstr[0] "Удалить беседу"
+msgstr[1] "Удалить беседы"
+msgstr[2] "Удалить бесед"
+
+#: src/client/components/components-info-bar.vala:248
+msgid "Information"
+msgstr "Информация"
+
+#: src/client/components/components-info-bar.vala:252
+msgid "Question"
+msgstr "Вопрос"
+
+#: src/client/components/components-info-bar.vala:256
+msgid "Warning"
+msgstr "Предупреждение"
+
+#: src/client/components/components-info-bar.vala:260
+msgid "Error"
+msgstr "Ошибка"
+
+#: src/client/components/components-inspector.vala:71
+#| msgid "_Inspect…"
+msgid "Inspector"
+msgstr "Ревизор"
+
+#. / Translators: Title for Inspector logs pane
+#. / Translators: Title for problem report dialog logs pane
+#: src/client/components/components-inspector.vala:86
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:98
+msgid "Logs"
+msgstr "Журналы"
+
+#. / Translators: Title for Inspector system system information pane
+#. / Translators: Title for problem report system information
+#. / pane
+#: src/client/components/components-inspector.vala:90
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:101
+msgid "System"
+msgstr "Система"
+
+#. Button label for saving problem report information
+#: src/client/components/components-inspector.vala:219
+#: src/client/components/components-inspector.vala:222
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:217
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:220
+#: ui/problem-details-dialog.ui:42
+#| msgid "_Save As..."
+msgid "Save As"
+msgstr "Сохранить Как"
+
+#: src/client/components/components-inspector.vala:223
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:221
+#: ui/accounts_editor_servers_pane.ui:15 ui/composer-headerbar.ui:55
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Отмена"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:124
+msgid "_Automatically select next message"
+msgstr "_Автоматически переходить к следующему сообщению"
 
-#: src/client/components/main-window.vala:440
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:134
+msgid "_Display conversation preview"
+msgstr "_Показывать предпросмотр сообщений"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:54
-#, c-format
-#| msgid "Error connecting to the server"
-msgid "Problem connecting to incoming server for %s"
-msgstr "Проблема подключения к серверу входящих для %s"
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:144
+msgid "Use _single key email shortcuts"
+msgstr "Использовать _одноклавишные горячие клавиши для почты"
 
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:56
-#: src/client/components/main-window-info-bar.vala:64
-#, c-format
+#: src/client/components/components-preferences-window.vala:146
 msgid ""
-"Could not connect to %s, check your Internet access and the server name and "
-"try again"
+"Enable keyboard shortcuts for email actions that do not require pressing "
+"<Ctrl>"
 msgstr ""
-"Не удалось подключиться к %s, проверьте доступ к Интернету и имя сервера, "
-"затем повторить попытку"
+"Включить сочетания клавиш для действий с почтой, которые не требуют нажатия "
+"<Ctrl>"
 
-#: src/client/components/main-window-info-bar.vala:57
-#: src/client/components/main-window-info-bar.vala:66
-msgid "Retry connecting now"
-msgstr "Повторить подключение сейчас"
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:157
+msgid "_Watch for new mail when closed"
+msgstr "_Следить за поступлением новых писем при закрытом приложении"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:62
-#, c-format
-#| msgid "Error connecting to the server"
-msgid "Problem connecting to outgoing server for %s"
-msgstr "Проблема подключения к серверу исходящих для %s"
+#. / Translators: Preferences tooltip
+#: src/client/components/components-preferences-window.vala:161
+msgid "Geary will keep running after all windows are closed"
+msgstr "Geary будет продолжать работать после закрытия всех окон"
 
-#: src/client/components/main-window-info-bar.vala:65
-msgid "Try reconnecting now"
-msgstr "Попробовать переподключиться сейчас"
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:178
+msgid "Preferences"
+msgstr "Параметры"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:71
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:234
+msgid "Plugins"
+msgstr "Плагины"
+
+#. Translators: Info bar title for a generic account
+#. problem.
+#: src/client/components/components-problem-report-info-bar.vala:36
+#| msgid "Accounts"
+msgid "Account problem"
+msgstr "Проблема с учетной записью"
+
+#. Translators: Info bar sub-title for a generic account
+#. problem. String substitution is the account name.
+#: src/client/components/components-problem-report-info-bar.vala:40
 #, c-format
-msgid "Problem with connection to incoming server for %s"
-msgstr "Проблема с подключением к серверу входящих для %s"
-
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:73
-#: src/client/components/main-window-info-bar.vala:81
+#| msgid "Geary has encountered a problem"
+msgid "Geary has encountered a problem with %s."
+msgstr "Geary столкнулся с проблемой с %s."
+
+#. Translators: Info bar sub-title for a generic
+#. account problem. String substitution is the
+#. account name.
+#: src/client/components/components-problem-report-info-bar.vala:53
 #, c-format
-msgid "Network error talking to %s, check your Internet access and try again"
-msgstr ""
-"Ошибка сети, связанная с %s, проверьте доступ к Интернету и повторите попытку"
+#| msgid "Geary has encountered a problem"
+msgid "Geary encountered a problem checking mail for %s."
+msgstr "Geary столкнулся с проблемой при проверке почты для %s."
 
-#: src/client/components/main-window-info-bar.vala:74
-#: src/client/components/main-window-info-bar.vala:82
-#: src/client/components/main-window-info-bar.vala:90
-#: src/client/components/main-window-info-bar.vala:98
-#: src/client/components/main-window-info-bar.vala:119
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:57
 msgid "Try reconnecting"
 msgstr "Попробовать переподключиться"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:79
-#, c-format
-#| msgid "Error connecting to the server"
-msgid "Problem with connection to outgoing server for %s"
-msgstr "Проблема с подключением к серверу исходящих для %s"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:87
-#, c-format
-msgid "Problem communicating with incoming server for %s"
-msgstr "Проблема связи с сервером входящих для %s"
-
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:89
-#, c-format
-msgid ""
-"Geary did not understand a message from %s or vice versa, please file a bug "
-"report"
-msgstr "Geary не понял сообщения от %s или наоборот, напишите отчёт об ошибке"
-
-#: src/client/components/main-window-info-bar.vala:94
-msgid "Problem communicating with outgoing mail server"
-msgstr "Проблема связи с сервером исходящих для %s"
-
-#. Translators: First string substitution is the server
-#. name, second is the account name
-#: src/client/components/main-window-info-bar.vala:97
+#. Translators: Info bar title for an outgoing
+#. account problem. String substitution is the
+#. account name
+#: src/client/components/components-problem-report-info-bar.vala:65
 #, c-format
-msgid ""
-"Could not communicate with %s for %s, check the server name and try again in "
-"a moment"
-msgstr ""
-"Не удалось связаться с %s для %s, проверьте имя сервера и повторите попытку"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:103
-#, c-format
-msgid "Incoming mail server password required for %s"
-msgstr "Требуется пароль сервера входящих для %s"
-
-#: src/client/components/main-window-info-bar.vala:104
-msgid "Messages cannot be received without the correct password."
-msgstr "Невозможно получить сообщения без правильного пароля."
-
-#: src/client/components/main-window-info-bar.vala:105
-msgid "Retry receiving email, you will be prompted for a password"
-msgstr ""
-"Повторить попытку получения электронной почты, вам будет предложено ввести "
-"пароль"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:110
-#, c-format
-msgid "Outgoing mail server password required for %s"
-msgstr "Требуется пароль сервера исходящих для %s"
-
-#: src/client/components/main-window-info-bar.vala:111
-msgid "Messages cannot be sent without the correct password."
-msgstr "Невозможно отправить сообщения без правильного пароля."
-
-#: src/client/components/main-window-info-bar.vala:112
-msgid "Retry sending queued messages, you will be prompted for a password"
-msgstr ""
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:117
-#, c-format
-msgid "A problem occurred checking mail for %s"
-msgstr ""
-
-#: src/client/components/main-window-info-bar.vala:118
-#: src/client/components/main-window-info-bar.vala:125
-msgid "Something went wrong, please file a bug report if the problem persists"
-msgstr ""
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:124
-#, c-format
-msgid "A problem occurred sending mail for %s"
-msgstr ""
+#| msgid "Geary has encountered a problem"
+msgid "Geary encountered a problem sending email for %s."
+msgstr "Geary столкнулся с проблемой при отправке почты для %s."
 
-#: src/client/components/main-window-info-bar.vala:126
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:69
 msgid "Retry sending queued messages"
-msgstr ""
-
-#: src/client/components/main-window-info-bar.vala:137
-msgid "A database problem has occurred"
-msgstr ""
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:139
-#, c-format
-msgid "Messages for %s must be downloaded again."
-msgstr ""
+msgstr "Повторная отправка сообщений, поставленных в очередь"
 
-#: src/client/components/main-window-info-bar.vala:152
+#. Translators: Info bar title for a generic application
+#. problem.
+#: src/client/components/components-problem-report-info-bar.vala:76
 msgid "Geary has encountered a problem"
 msgstr "Geary столкнулся с проблемой"
 
-#: src/client/components/main-window-info-bar.vala:153
-msgid ""
-"Please check the technical details and report the problem if it persists."
-msgstr ""
-"Проверьте технические детали и сообщите о проблеме, если она сохраняется."
-
-#: src/client/components/main-window-info-bar.vala:161
+#. Translators: Info bar sub-title for a generic
+#. application problem.
+#: src/client/components/components-problem-report-info-bar.vala:80
+#| msgid ""
+#| "Please check the technical details and report the problem if it persists."
+msgid "Please report the details if it persists."
+msgstr "Пожалуйста, сообщите подробности, если это не прекратится."
+
+#. Translators: Button label for viewing technical details
+#. for a problem report.
+#: src/client/components/components-problem-report-info-bar.vala:94
 msgid "_Details"
 msgstr "_Подробности"
 
-#: src/client/components/main-window-info-bar.vala:162
+#. Translators: Tooltip for viewing technical details for
+#. a problem report.
+#: src/client/components/components-problem-report-info-bar.vala:97
 msgid "View technical details about the error"
 msgstr "Просмотреть технические сведения об ошибке"
 
-#: src/client/components/main-window-info-bar.vala:166
+#. Translators: Button label for retrying a server
+#. connection
+#: src/client/components/components-problem-report-info-bar.vala:103
 msgid "_Retry"
-msgstr "Повто_рить"
-
-#: src/client/components/main-window-info-bar.vala:253
-msgid "Details"
-msgstr "Подробности"
+msgstr "_Повторить"
 
-#: src/client/components/main-window-info-bar.vala:266
-#: src/client/components/stock.vala:23
-msgid "_Close"
-msgstr "_Закрыть"
-
-#: src/client/components/main-window-info-bar.vala:270
-msgid "Copy to Clipboard"
-msgstr "Скопировать в буфер обмена"
-
-#: src/client/components/main-window-info-bar.vala:273
-msgid ""
-"Copy technical details to clipboard for pasting into an email or bug report"
-msgstr ""
-"Скопируйте технические данные в буфер обмена для вставки в сообщение "
-"электронной почты или в сообщение об ошибке"
-
-#: src/client/components/search-bar.vala:8
-#: src/client/folder-list/folder-list-search-branch.vala:38
-#: src/engine/api/geary-special-folder-type.vala:51
+#. / Translators: Search entry placeholder text
+#: src/client/components/components-search-bar.vala:12
+#: src/client/folder-list/folder-list-search-branch.vala:53
+#: src/client/util/util-i18n.vala:298
 msgid "Search"
 msgstr "Поиск"
 
-#. Search entry.
-#: src/client/components/search-bar.vala:23
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Поиск по всей почте учётной записи по ключевым словам (Ctrl+S)"
-
-#: src/client/components/search-bar.vala:100
-#, c-format
-msgid "Indexing %s account"
-msgstr "Индексируется учётная запись %s"
+#. / Translators: Search entry tooltip
+#: src/client/components/components-search-bar.vala:32
+#| msgid "Search all mail in account for keywords (Ctrl+S)"
+msgid "Search all mail in account for keywords"
+msgstr "Поиск по ключевым словам во всех письмах в аккаунте"
 
-#: src/client/components/search-bar.vala:111
-#: src/client/folder-list/folder-list-search-branch.vala:39
+#. / Translators: Search entry placeholder, string
+#. / replacement is the name of an account
+#: src/client/components/components-search-bar.vala:81
+#: src/client/folder-list/folder-list-search-branch.vala:54
 #, c-format
 msgid "Search %s account"
 msgstr "Поиск учётной записи %s"
 
+#. Translators: Tooltip used when an entry requires a valid
+#. email address to be entered, but one is not provided.
+#: src/client/components/components-validator.vala:394
+#| msgid "Invalid email address"
+msgid "An email address is required"
+msgstr "Следует указать адрес почты"
+
+#. Translators: Tooltip used when an entry requires a valid
+#. email address to be entered, but the address is invalid.
+#: src/client/components/components-validator.vala:398
+#| msgid "Invalid email address"
+msgid "Not a valid email address"
+msgstr "Недействительный адрес почты"
+
+#. Translators: Tooltip used when an entry requires a valid,
+#. resolvable server name to be entered, but one is not
+#. provided.
+#: src/client/components/components-validator.vala:444
+msgid "A server name is required"
+msgstr "Следует указать имя сервера"
+
+#. Translators: Tooltip used when an entry requires a valid
+#. server name to be entered, but it was unable to be
+#. looked-up in the DNS.
+#: src/client/components/components-validator.vala:449
+msgid "Could not look up server name"
+msgstr "Не удалось найти имя сервера"
+
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
 #: src/client/components/status-bar.vala:26
 msgid "Sending…"
 msgstr "Отправка…"
 
-#: src/client/components/stock.vala:18 ui/account_cannot_remove.glade:74
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: src/client/components/status-bar.vala:29
+msgid "Error sending email"
+msgstr "Ошибка отправки почты"
+
+#. Displayed in the space-limited status bar when a message fails to be uploaded
+#. to Sent Mail after being sent.
+#: src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
+msgstr "Ошибка сохранения отправленной почты"
+
+#: src/client/components/stock.vala:18
 msgid "_OK"
 msgstr "_ОК"
 
-#: src/client/components/stock.vala:19 ui/edit_alternate_emails.glade:160
-#: ui/password-dialog.glade:196 ui/remove_confirm.glade:155
-msgid "_Cancel"
-msgstr "О_тмена"
-
-#: src/client/components/stock.vala:21 ui/gtk/menus.ui:34
+#: src/client/components/stock.vala:21
 msgid "_About"
 msgstr "_О приложении"
 
+#: src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Добавить"
+
+#: src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Закрыть"
+
 #: src/client/components/stock.vala:24
 msgid "_Discard"
-msgstr "От_казаться"
+msgstr "_Отказаться"
 
-#: src/client/components/stock.vala:25 ui/gtk/menus.ui:29
+#: src/client/components/stock.vala:25 ui/components-main-toolbar-menus.ui:42
 msgid "_Help"
 msgstr "_Справка"
 
-#: src/client/components/stock.vala:26 ui/conversation-email-menus.ui:77
+#: src/client/components/stock.vala:26
+#: src/client/plugin/mail-merge/mail-merge.vala:391
+#: ui/components-attachment-pane-menus.ui:7
 msgid "_Open"
-msgstr "Отк_рыть"
+msgstr "_Открыть"
 
-#: src/client/components/stock.vala:27 ui/gtk/menus.ui:17
+#: src/client/components/stock.vala:27 ui/components-main-toolbar-menus.ui:32
 msgid "_Preferences"
-msgstr "П_араметры"
+msgstr "_Параметры"
 
 #. Translators: Menu item to print a single, specific message
 #: src/client/components/stock.vala:28 ui/conversation-email-menus.ui:64
 msgid "_Print…"
-msgstr "П_ечать…"
+msgstr "_Печать…"
 
-#: src/client/components/stock.vala:29 ui/gtk/menus.ui:38
+#: src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Завершить"
 
-#: src/client/components/stock.vala:30 ui/remove_confirm.glade:170
+#: src/client/components/stock.vala:30
 msgid "_Remove"
 msgstr "_Удалить"
 
+#: src/client/components/stock.vala:31
+#: ui/components-attachment-pane-menus.ui:11
+msgid "_Save"
+msgstr "_Сохранить"
+
 #: src/client/components/stock.vala:32
 msgid "_Keep"
-msgstr "О_ставить"
+msgstr "_Оставить"
+
+#: src/client/composer/composer-editor.vala:680
+msgid "Select Color"
+msgstr "Выбрать Цвет"
 
-#: src/client/composer/composer-link-popover.vala:149
+#: src/client/composer/composer-link-popover.vala:139
 msgid "Link URL is not correctly formatted, e.g. http://example.com";
 msgstr ""
 "Ссылка URL неверно отформатирована, пример правильно оформленной ссылки "
 "http://example.com";
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid link URL"
 msgstr "Некорректная ссылка URL"
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid email address"
-msgstr "Некорректный адрес эл. почты"
+msgstr "Некорректный адрес почты"
+
+#. / Translators: Title for an empty composer window
+#: src/client/composer/composer-widget.vala:32
+msgid "New Message"
+msgstr "Новое Cообщение"
 
-#: src/client/composer/composer-widget.vala:158
+#: src/client/composer/composer-widget.vala:233
 msgid "Saved"
-msgstr "Сохранён"
+msgstr "Сохранено"
 
-#: src/client/composer/composer-widget.vala:159
+#: src/client/composer/composer-widget.vala:234
 msgid "Saving"
 msgstr "Сохраняется"
 
-#: src/client/composer/composer-widget.vala:160
+#: src/client/composer/composer-widget.vala:235
 msgid "Error saving"
 msgstr "Ошибка сохранения"
 
-#: src/client/composer/composer-widget.vala:161
+#: src/client/composer/composer-widget.vala:236
 msgid "Press Backspace to delete quote"
 msgstr "Нажмите клавишу Backspace для удаления цитаты"
 
 #. Translators: This is list of keywords, separated by pipe ("|")
 #. characters, that suggest an attachment; since this is full-word
-#. checking, include all variants of each word.  No spaces are
-#. allowed.
-#: src/client/composer/composer-widget.vala:170
+#. checking, include all variants of each word. No spaces are
+#. allowed. The words will be converted to lower case based on
+#. locale and English versions included automatically.
+#: src/client/composer/composer-widget.vala:252
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1189,232 +1782,345 @@ msgstr ""
 "прикрепить|прикрепление|прикрепления|прикреплён|прикреплены|вложение|"
 "вложенные|вложения"
 
+#. / Translators: Label for composer From address entry
+#: src/client/composer/composer-widget.vala:483
+#| msgid "_From:"
+msgid "_From"
+msgstr "_От"
+
+#. / Translators: Label for composer To address entry
+#: src/client/composer/composer-widget.vala:493
+msgid "_To"
+msgstr "_Кому"
+
+#. / Translators: Label for composer CC address entry
+#: src/client/composer/composer-widget.vala:502
+msgid "_Cc"
+msgstr "_Копия"
+
+#. / Translators: Label for composer BCC address entry
+#: src/client/composer/composer-widget.vala:510
+msgid "_Bcc"
+msgstr "_Скрытая копия"
+
+#. / Translators: Label for composer Reply-To address entry
+#: src/client/composer/composer-widget.vala:518
+#| msgid "Reply to:"
+msgid "_Reply to"
+msgstr "_Ответить"
+
+#. / Translators: Label for composer Subject line entry
+#: src/client/composer/composer-widget.vala:526
+msgid "_Subject"
+msgstr "_Тема"
+
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. Keep, Discard or Cancel.
-#: src/client/composer/composer-widget.vala:1102
+#: src/client/composer/composer-widget.vala:904
 msgid "Do you want to keep or discard this draft message?"
 msgstr "Вы хотите сохранить или отказаться от этого черновика сообщения?"
 
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. only Discard or Cancel.
-#: src/client/composer/composer-widget.vala:1130
+#: src/client/composer/composer-widget.vala:930
 msgid "Do you want to discard this draft message?"
 msgstr "Вы хотите отказаться от этого черновика сообщения?"
 
-#: src/client/composer/composer-widget.vala:1247
+#: src/client/composer/composer-widget.vala:1503
 msgid "Send message with an empty subject and body?"
 msgstr "Отправить сообщение с пустой темой и без текста?"
 
-#: src/client/composer/composer-widget.vala:1249
+#: src/client/composer/composer-widget.vala:1505
 msgid "Send message with an empty subject?"
 msgstr "Отправить сообщение с пустой темой?"
 
-#: src/client/composer/composer-widget.vala:1251
+#: src/client/composer/composer-widget.vala:1507
 msgid "Send message with an empty body?"
 msgstr "Отправить сообщение без текста?"
 
-#: src/client/composer/composer-widget.vala:1255
+#: src/client/composer/composer-widget.vala:1516
 msgid "Send message without an attachment?"
 msgstr "Отправить сообщение без прикреплённых файлов?"
 
-#: src/client/composer/composer-widget.vala:1560
+#: src/client/composer/composer-widget.vala:1858
 #, c-format
 msgid "“%s” already attached for delivery."
-msgstr "«%s» уже вложено в письмо."
+msgstr "\"%s\" уже вложено для отправки."
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#. Translators: The first argument will be a
-#. description of the document type, the second will
-#. be a human-friendly size string. For example:
-#. Document (100.9MB)
-#: src/client/composer/composer-widget.vala:1568
-#: src/client/conversation-viewer/conversation-email.vala:136
+#: src/client/composer/composer-widget.vala:1890
+#: src/client/composer/composer-widget.vala:1940
 #, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid "“%s” is an empty file."
+msgstr "\"%s\" является пустым файлом."
 
-#: src/client/composer/composer-widget.vala:1605
+#: src/client/composer/composer-widget.vala:1928
 #, c-format
 msgid "“%s” could not be found."
-msgstr "Невозможно найти «%s»."
+msgstr "\"%s\" невозможно найти."
 
-#: src/client/composer/composer-widget.vala:1611
+#: src/client/composer/composer-widget.vala:1934
 #, c-format
 msgid "“%s” is a folder."
-msgstr "«%s» является каталогом."
-
-#: src/client/composer/composer-widget.vala:1617
-#, c-format
-msgid "“%s” is an empty file."
-msgstr "«%s» — пустой файл."
+msgstr "\"%s\" является папкой."
 
-#: src/client/composer/composer-widget.vala:1630
+#: src/client/composer/composer-widget.vala:1953
 #, c-format
 msgid "“%s” could not be opened for reading."
-msgstr "Невозможно открыть для чтения «%s»."
+msgstr "\"%s\" невозможно открыть для чтения."
 
-#: src/client/composer/composer-widget.vala:1638
+#: src/client/composer/composer-widget.vala:1961
 msgid "Cannot add attachment"
 msgstr "Невозможно добавить вложение"
 
-#: src/client/composer/composer-widget.vala:1687
-msgid "To: "
-msgstr "Кому: "
+#. Translators: This is the name of the file chooser filter
+#. when inserting an image in the composer.
+#: src/client/composer/composer-widget.vala:2032
+msgid "Images"
+msgstr "Изображения"
 
-#: src/client/composer/composer-widget.vala:1690
-msgid "Cc: "
-msgstr "Копия: "
+#. Translators: Human-readable version of the RFC 822 To header
+#: src/client/composer/composer-widget.vala:2096
+#: src/client/conversation-viewer/conversation-email.vala:536
+#: src/client/util/util-email.vala:267 ui/conversation-message.ui:283
+msgid "To:"
+msgstr "Кому:"
+
+#. Translators: Human-readable version of the RFC 822 CC header
+#: src/client/composer/composer-widget.vala:2102
+#: src/client/conversation-viewer/conversation-email.vala:541
+#: src/client/util/util-email.vala:272 ui/conversation-message.ui:324
+msgid "Cc:"
+msgstr "Копия:"
 
-#: src/client/composer/composer-widget.vala:1693
-msgid "Bcc: "
-msgstr "Скрытая копия: "
+#. Translators: Human-readable version of the RFC 822 BCC header
+#: src/client/composer/composer-widget.vala:2108
+#: src/client/conversation-viewer/conversation-email.vala:546
+#: ui/conversation-message.ui:365
+msgid "Bcc:"
+msgstr "Скрытая копия:"
 
-#: src/client/composer/composer-widget.vala:1696
+#. Translators: Human-readable version of the RFC 822 Reply-To header
+#: src/client/composer/composer-widget.vala:2114
 msgid "Reply-To: "
 msgstr "Ответить: "
 
-#: src/client/composer/composer-widget.vala:1834
-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:2024
+#. 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:2232
 #, 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:2082
-msgid "_From:"
-msgstr "_От:"
-
-#. Translators: This is the name of the file chooser filter
-#. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2307
-msgid "Images"
-msgstr "Изображения"
-
-#: src/client/composer/composer-window.vala:14
-msgid "New Message"
-msgstr "Новое сообщение"
-
-#: src/client/composer/spell-check-popover.vala:117
+#: src/client/composer/spell-check-popover.vala:125
 msgid "Remove this language from the preferred list"
 msgstr "Удалить этот язык из списка предпочтений"
 
-#: src/client/composer/spell-check-popover.vala:121
+#: src/client/composer/spell-check-popover.vala:129
 msgid "Add this language to the preferred list"
 msgstr "Добавить этот язык в список предпочтений"
 
-#: src/client/composer/spell-check-popover.vala:217
+#: src/client/composer/spell-check-popover.vala:225
 msgid "Search for more languages"
 msgstr "Поиск дополнительных языков"
 
-#: src/client/conversation-list/conversation-list-view.vala:283
-msgid "Delete conversation"
-msgstr "Удалить беседу"
-
-#: src/client/conversation-list/conversation-list-view.vala:286
-#: ui/main-toolbar-menus.ui:16
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:390
+#| msgid "Move conversations"
+msgid "Move conversation to _Trash"
+msgid_plural "Move conversations to _Trash"
+msgstr[0] "Переместить беседу в _Корзину"
+msgstr[1] "Переместить беседы в _Корзину"
+msgstr[2] "Переместить бесед в _Корзину"
+
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:402
+#| msgid "Delete conversation"
+msgid "_Delete conversation"
+msgid_plural "_Delete conversations"
+msgstr[0] "_Удалить беседу"
+msgstr[1] "_Удалить беседы"
+msgstr[2] "_Удалить бесед"
+
+#: src/client/conversation-list/conversation-list-view.vala:415
+#: ui/components-main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Отметить как _Прочитанное"
 
-#: src/client/conversation-list/conversation-list-view.vala:289
-#: ui/main-toolbar-menus.ui:20
+#: src/client/conversation-list/conversation-list-view.vala:423
+#: ui/components-main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Отметить как _Непрочитанное"
 
-#: src/client/conversation-list/conversation-list-view.vala:292
-#: ui/main-toolbar-menus.ui:28
+#: src/client/conversation-list/conversation-list-view.vala:431
+#: ui/components-main-toolbar-menus.ui:17
 msgid "U_nstar"
-msgstr "_Убрать из избранных"
+msgstr "У_брать из Помеченных"
 
-#: src/client/conversation-list/conversation-list-view.vala:294
-#: ui/main-toolbar-menus.ui:24
+#: src/client/conversation-list/conversation-list-view.vala:438
+#: ui/components-main-toolbar-menus.ui:13
 msgid "_Star"
-msgstr "_Добавить в избранное"
+msgstr "_Добавить в Помеченные"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:297
+#: src/client/conversation-list/conversation-list-view.vala:455
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Ответить"
 
-#: src/client/conversation-list/conversation-list-view.vala:298
+#: src/client/conversation-list/conversation-list-view.vala:461
 msgid "R_eply All"
-msgstr "О_тветить всем"
+msgstr "О_тветить Всем"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:299
+#: src/client/conversation-list/conversation-list-view.vala:467
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "_Переслать"
 
-#: src/client/conversation-list/formatted-conversation-data.vala:11
+#: src/client/conversation-list/formatted-conversation-data.vala:18
 msgid "Me"
 msgstr "Я"
 
-#. Translators: This is the file type displayed for
-#. attachments with unknown file types.
-#: src/client/conversation-viewer/conversation-email.vala:122
-msgid "Unknown"
-msgstr "Неизвестный"
-
-#: src/client/conversation-viewer/conversation-message.vala:60
+#. Translators: Human-readable version of the RFC 822 From header
+#: src/client/conversation-viewer/conversation-email.vala:531
+#: src/client/util/util-email.vala:258
+msgid "From:"
+msgstr "От:"
+
+#. Translators: Human-readable version of the RFC 822 Date header
+#: src/client/conversation-viewer/conversation-email.vala:551
+#: src/client/util/util-email.vala:263
+msgid "Date:"
+msgstr "Дата:"
+
+#. Translators: Human-readable version of the RFC 822 Subject header
+#: src/client/conversation-viewer/conversation-email.vala:561
+#: src/client/util/util-email.vala:261
+#| msgid "Subject"
+msgid "Subject:"
+msgstr "Тема:"
+
+#: src/client/conversation-viewer/conversation-message.vala:128
 msgid "This email address may have been forged"
-msgstr "Возможно, этот адрес электронной почты был подделан"
-
-#. Preview headers
+msgstr "Возможно, этот адрес почты был подделан"
+
+#. Translators: Label text displayed when there are too
+#. many email addresses to be shown by default in an
+#. email's header, but they are all being shown anyway.
+#: src/client/conversation-viewer/conversation-message.vala:234
+#| msgid "Show Images"
+msgid "Show less"
+msgstr "Показать меньше"
+
+#. Translators: Label text displayed when there are
+#. too many email addresses to be shown by default in
+#. an email's header. The string substitution is the
+#. number of extra email to be shown.
+#: src/client/conversation-viewer/conversation-message.vala:260
+#, c-format
+msgid "%d more…"
+msgid_plural "%d more…"
+msgstr[0] "%d еще…"
+msgstr[1] "%d еще…"
+msgstr[2] "%d еще…"
+
+#. Compact headers. These are partially done here and partially
+#. in load_contacts.
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: src/client/conversation-viewer/conversation-message.vala:330
+#: src/client/conversation-viewer/conversation-message.vala:533
 msgid "No sender"
 msgstr "Отправитель не указан"
 
 #. Translators: This separates multiple 'from'
-#. addresses in the header preview for a message.
-#: src/client/conversation-viewer/conversation-message.vala:589
+#. addresses in the compact header for a message.
+#: src/client/conversation-viewer/conversation-message.vala:1011
 msgid ", "
 msgstr ", "
 
 #. Translators: This string is used as the HTML IMG ALT
 #. attribute value when displaying an inline image in an email
 #. that did not specify a file name. E.g. <IMG ALT="Image" ...
-#: src/client/conversation-viewer/conversation-message.vala:691
+#: src/client/conversation-viewer/conversation-message.vala:1133
 msgid "Image"
 msgstr "Изображение"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:74
+#: src/client/conversation-viewer/conversation-message.vala:1341
+#: src/client/conversation-viewer/conversation-message.vala:1347
+#| msgid "Unknown"
+msgid "(unknown)"
+msgstr "(неизвестный)"
+
+#. Translators: Info bar status message
+#: src/client/conversation-viewer/conversation-message.vala:1396
+msgid "Remote images not shown"
+msgstr "Внешние изображения не показаны"
+
+#. Translators: Info bar description
+#: src/client/conversation-viewer/conversation-message.vala:1398
+msgid "Only show remote images from senders you trust."
+msgstr "Отображать внешние изображения только от доверенных отправителей."
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1402
+#| msgctxt "shortcut window"
+#| msgid "Show help"
+msgid "Show"
+msgstr "Показать"
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1406
+#| msgid "Always Show From Sender"
+msgid "Always show from sender"
+msgstr "Всегда показывать от отправителя"
+
+#. Translators: Title label for placeholder when no
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:84
 msgid "No conversations selected"
 msgstr "Беседы не выбраны"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:76
+#. Translators: Sub-title label for placeholder when no
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:88
 msgid "Selecting a conversation from the list will display it here"
 msgstr "Выбор беседы из списка отобразит её здесь"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:81
+#. Translators: Title label for placeholder when multiple
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:97
 msgid "Multiple conversations selected"
 msgstr "Выбрано несколько бесед"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:83
+#. Translators: Sub-title label for placeholder when multiple
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:101
 msgid "Choosing an action will apply to all selected conversations"
 msgstr "Выбор действия будет применен ко всем выбранным беседам"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:88
-#: src/client/conversation-viewer/conversation-viewer.vala:95
+#. Translators: Title label for placeholder when no
+#. conversations have exist in a folder.
+#. Translators: Title label for placeholder when no
+#. conversations have been found in a search.
+#: src/client/conversation-viewer/conversation-viewer.vala:110
+#: src/client/conversation-viewer/conversation-viewer.vala:123
 msgid "No conversations found"
 msgstr "Беседы не найдены"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:90
+#. Translators: Sub-title label for placeholder when no
+#. conversations have exist in a folder.
+#: src/client/conversation-viewer/conversation-viewer.vala:114
 msgid "This folder does not contain any conversations"
 msgstr "Эта папка не содержит беседы"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:97
+#. Translators: Sub-title label for placeholder when no
+#. conversations have been found in a search.
+#: src/client/conversation-viewer/conversation-viewer.vala:127
 msgid "Your search returned no results, try refining your search terms"
 msgstr "Поиск не дал результатов, попробуйте уточнить запрос"
 
@@ -1426,7 +2132,7 @@ msgstr "Выберите файл"
 msgid "_Attach"
 msgstr "_Прикрепить"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:35
+#: src/client/dialogs/certificate-warning-dialog.vala:36
 #, c-format
 msgid "Untrusted Connection: %s"
 msgstr "Недоверенное соединение: %s"
@@ -1463,11 +2169,7 @@ msgstr ""
 "Выбор «Не доверять этому серверу» приведёт к остановке доступа к этому "
 "серверу."
 
-#: src/client/dialogs/certificate-warning-dialog.vala:65
-msgid "Geary will exit if you have no other open email accounts."
-msgstr "Geary завершит работу если нет других открытых учётных записей."
-
-#: src/client/dialogs/certificate-warning-dialog.vala:70
+#: src/client/dialogs/certificate-warning-dialog.vala:69
 msgid ""
 "Contact your system administrator or email service provider if you have any "
 "question about these issues."
@@ -1475,34 +2177,42 @@ msgstr ""
 "Свяжитесь с системным администратором или с провайдером электронной почты "
 "если есть какие-либо вопросы по данным проблемам."
 
-#: src/client/dialogs/certificate-warning-dialog.vala:77
+#: src/client/dialogs/certificate-warning-dialog.vala:76
 msgid "The server’s certificate is not signed by a known authority"
 msgstr "Сертификат сервера не подписан известным центром сертификации"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:80
+#: src/client/dialogs/certificate-warning-dialog.vala:79
 msgid "The server’s identity does not match the identity in the certificate"
 msgstr "Учётные данные сервера не совпадают с учётными данными в сертификате"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:83
+#: src/client/dialogs/certificate-warning-dialog.vala:82
 msgid "The server’s certificate has expired"
 msgstr "Сертификат сервера просрочен"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:86
+#: src/client/dialogs/certificate-warning-dialog.vala:85
 msgid "The server’s certificate has not been activated"
 msgstr "Сертификат сервера не был активирован"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:89
+#: src/client/dialogs/certificate-warning-dialog.vala:88
 msgid "The server’s certificate has been revoked and is now invalid"
 msgstr "Сертификат сервера был отозван и теперь недействителен"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:92
+#: src/client/dialogs/certificate-warning-dialog.vala:91
 msgid "The server’s certificate is considered insecure"
 msgstr "Сертификат сервера считается небезопасным"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:95
+#: src/client/dialogs/certificate-warning-dialog.vala:94
 msgid "An error has occurred processing the server’s certificate"
 msgstr "Произошла ошибка обработки сертификата сервера"
 
+#. / Translators: Title for problem report dialog error
+#. / information pane
+#. Dialog title for displaying technical details of a problem. Same as the button that invokes it.
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:96
+#: ui/problem-details-dialog.ui:15
+msgid "Details"
+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
@@ -1510,8 +2220,10 @@ msgstr "Произошла ошибка обработки сертификат
 msgid "Geary requires your email password to continue"
 msgstr "Geary требуется пароль эл. почты чтобы продолжить"
 
-#. Label displaying total number of email messages in a folder
-#: src/client/folder-list/folder-list-folder-entry.vala:32
+#. Translators: Label displaying total number of email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:42
 #, c-format
 msgid "%d message"
 msgid_plural "%d messages"
@@ -1519,8 +2231,10 @@ msgstr[0] "%d сообщение"
 msgstr[1] "%d сообщения"
 msgstr[2] "%d сообщений"
 
-#. / Label displaying number of unread email messages in a folder
-#: src/client/folder-list/folder-list-folder-entry.vala:39
+#. Translators: Label displaying number of unread email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:52
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
@@ -1528,19 +2242,21 @@ msgstr[0] "%d непрочитанное"
 msgstr[1] "%d непрочитанных"
 msgstr[2] "%d непрочитанных"
 
-#. / This string represents the divider between two messages: "n messages" and "n unread",
-#. / shown in the folder list as a tooltip.  Please use your languages conventions for
-#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
-#: src/client/folder-list/folder-list-folder-entry.vala:45
+#. Translators: 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:60
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: src/client/folder-list/folder-list-inboxes-branch.vala:14
+#: src/client/folder-list/folder-list-inboxes-branch.vala:15
 msgid "Inboxes"
 msgstr "Входящие"
 
-#: src/client/folder-list/folder-list-search-branch.vala:44
+#: src/client/folder-list/folder-list-search-branch.vala:59
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
@@ -1548,12 +2264,40 @@ msgstr[0] "%d результат"
 msgstr[1] "%d результата"
 msgstr[2] "%d результатов"
 
-#: src/client/notification/libmessagingmenu.vala:75
+#. / Notification body when a message as been received
+#. / and other unread messages have not been
+#. / seen. First string substitution is the message
+#. / subject and the second is the number of unseen
+#. / messages
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:126
 #, c-format
-msgid "%s — New Messages"
-msgstr "Новые сообщения — %s"
+#| msgid ""
+#| "%s\n"
+#| "(%d other new message for %s)"
+#| msgid_plural ""
+#| "%s\n"
+#| "(%d other new messages for %s)"
+msgid ""
+"%s\n"
+"(%d other new message)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages)"
+msgstr[0] ""
+"%s\n"
+"(%d другое новое сообщение)"
+msgstr[1] ""
+"%s\n"
+"(%d других новых сообщения)"
+msgstr[2] ""
+"%s\n"
+"(%d других новых сообщений)"
 
-#: src/client/notification/libnotify.vala:70
+#. / Notification body when multiple messages have been
+#. / received at the same time and other unseen messages
+#. / exist. String substitution is the number of new
+#. / messages that have arrived.
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:159
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@@ -1561,7 +2305,13 @@ msgstr[0] "%d новое сообщение"
 msgstr[1] "%d новых сообщения"
 msgstr[2] "%d новых сообщений"
 
-#: src/client/notification/libnotify.vala:73
+#. / Notification body when multiple messages have been
+#. / received at the same time and some unseen messages
+#. / already exist. String substitution is the message
+#. / above with the number of new messages that have
+#. / arrived, number substitution is the total number
+#. / of unseen messages.
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:169
 #, c-format
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
@@ -1569,127 +2319,284 @@ msgstr[0] "%s, всего %d новое сообщение"
 msgstr[1] "%s, всего %d новых сообщения"
 msgstr[2] "%s, всего %d новых сообщений"
 
-#: src/client/notification/libnotify.vala:105
+#. / Notification title when new messages have been
+#. / received
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:278
+#| msgid "New Message"
+msgid "New message"
+msgid_plural "New messages"
+msgstr[0] "Новое сообщение"
+msgstr[1] "Новых сообщения"
+msgstr[2] "Новых сообщений"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:4
+#| msgid "Email address:"
+msgid "Email Templates"
+msgstr "Шаблоны эл. почты"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:5
+msgid "Create reusable templates for sending email"
+msgstr "Создать многоразовые шаблоны для отправки эл. почты"
+
+#. Translators: Templates folder name alternatives. Separate names
+#. using a vertical bar and put the most common localized name to
+#. the front for the default. English names do not need to be
+#. included.
+#: src/client/plugin/email-templates/email-templates.vala:29
+#: src/client/plugin/mail-merge/mail-merge.vala:29
+#| msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgid "Templates | Template Mail | Template Email | Template E-Mail"
+msgstr "Шаблоны | Шаблоны Mail | Шаблоны Email | Шаблоны E-Mail"
+
+#. Translators: The name of the folder used to
+#. store email templates
+#: src/client/plugin/email-templates/email-templates.vala:201
+msgid "Templates"
+msgstr "Шаблоны"
+
+#. Translators: Info bar button label for creating a
+#. new email template
+#: src/client/plugin/email-templates/email-templates.vala:282
+#| msgid "Now"
+msgid "New"
+msgstr "Новый"
+
+#. Translators: Infobar status label for an email template
+#: src/client/plugin/email-templates/email-templates.vala:293
+#| msgid "Message not saved"
+msgid "Message template"
+msgstr "Шаблон сообщения"
+
+#. Translators: Info bar button label for sending an
+#. email template
+#: src/client/plugin/email-templates/email-templates.vala:297
+#| msgctxt "shortcut window"
+#| msgid "Send"
+msgid "Send"
+msgstr "Прислать"
+
+#. Translators: Info bar button label for editing an
+#. existing email template
+#. Translators: Info bar button label for editing a draft
+#. email
+#: src/client/plugin/email-templates/email-templates.vala:305
+#: src/client/plugin/mail-merge/mail-merge.vala:336
+#: src/client/plugin/special-folders/special-folders.vala:187
+msgid "Edit"
+msgstr "Редактировать"
+
+#. / Translators: Menu item label for invoking mail
+#. / merge in composer
+#. / Translators: File chooser title after invoking mail
+#. / merge in composer
+#. Translators: The name of the folder used to
+#. display merged email
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:5
+#: src/client/plugin/mail-merge/mail-merge.vala:288
+#: src/client/plugin/mail-merge/mail-merge.vala:389
+#: src/client/plugin/mail-merge/mail-merge.vala:488
+msgid "Mail Merge"
+msgstr "Объединение Почты"
+
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:6
+msgid "Fill in and send email templates using a spreadsheet"
+msgstr "Заполнение и отправка шаблонов эл. почты с помощью электронной таблицы"
+
+#. Translators: Info bar label for starting sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:118
+#| msgctxt "shortcut window"
+#| msgid "Star"
+msgid "Start"
+msgstr "Начать"
+
+#. Translators: Info bar label for pausing sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:130
+msgid "Pause"
+msgstr "Пауза"
+
+#. Translators: Info bar description for the mail merge
+#. folder. The first string substitution the number of email
+#. already sent, the second is the total number to send.
+#: src/client/plugin/mail-merge/mail-merge.vala:240
 #, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
-"%s\n"
-"(%d другое сообщение для %s)"
-msgstr[1] ""
-"%s\n"
-"(%d других сообщения для %s)"
-msgstr[2] ""
-"%s\n"
-"(%d других сообщений для %s)"
+msgid "Sent %u of %u"
+msgid_plural "Sent %u of %u"
+msgstr[0] "Отправлено %u из %u"
+msgstr[1] "Отправлено %u из %u"
+msgstr[2] "Отправлено %u из %u"
+
+#. Translators: Infobar status label for an email mail merge
+#. template
+#: src/client/plugin/mail-merge/mail-merge.vala:324
+msgid "Mail merge template"
+msgstr "Шаблон объединения почты"
+
+#. Translators: Info bar button label for performing a
+#. mail-merge on an email template
+#: src/client/plugin/mail-merge/mail-merge.vala:328
+msgid "Merge"
+msgstr "Объединить"
+
+#. / Translators: Action bar menu button label for
+#. / mail-merge plugin
+#: src/client/plugin/mail-merge/mail-merge.vala:377
+#| msgctxt "shortcut window"
+#| msgid "Insert a link"
+msgid "Insert field"
+msgstr "Вставить поле"
+
+#. / Translators: File chooser filer label
+#: src/client/plugin/mail-merge/mail-merge.vala:396
+msgid "Comma separated values (CSV)"
+msgstr "Значения, разделенные запятыми (CSV)"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:4
+msgid "Messaging Menu"
+msgstr "Меню Обмена Сообщениями"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:5
+#| msgid "Show notifications for new mail"
+msgid "Displays Unity Messaging Menu notifications for new email"
+msgstr ""
+"Показывать уведомления меню обмена сообщениями Unity, когда приходит новая "
+"почта"
+
+#: src/client/plugin/messaging-menu/messaging-menu.vala:79
+#, c-format
+msgid "%s — New Messages"
+msgstr "%s — Новые Сообщения"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:4
+#| msgid "not found"
+msgid "Sent Sound"
+msgstr "Звук Отправки"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:5
+msgid "Plays the desktop sent-mail sound when an email is sent"
+msgstr ""
+"Воспроизводит звук sent-mail рабочего стола, когда вы отправляете почту"
+
+#. Translators: Info bar button label for emptying
+#. trash/spam folders
+#: src/client/plugin/special-folders/special-folders.vala:167
+msgid "Empty"
+msgstr "Очистить"
+
+#. Translators: Info bar status message for a draft email
+#: src/client/plugin/special-folders/special-folders.vala:179
+msgid "Draft message"
+msgstr "Черновое сообщение"
+
+#. Translators: Info bar status description for a draft
+#. email
+#: src/client/plugin/special-folders/special-folders.vala:182
+msgid "This message has not yet been sent."
+msgstr "Это сообщение ещё не было отправлено."
+
+#. Translators: Info bar status message for an sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:198
+msgid "Message not saved"
+msgstr "Сообщение не сохранено"
 
-#: src/client/notification/libnotify.vala:161
-msgid "Open"
-msgstr "Открыть"
+#. Translators: Info bar status description for a sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:201
+msgid "This message was sent, but has not been saved to your account."
+msgstr "Сообщение отправлено, но не сохранено в вашей учётной записи."
 
 #. / Datetime format for 12-hour time, i.e. 8:31 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:68
+#: src/client/util/util-date.vala:69
 msgid "%l:%M %P"
 msgstr "%l:%M %P"
 
 #. / Datetime format for 24-hour time, i.e. 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:71
+#: src/client/util/util-date.vala:72
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:74
-msgctxt "Default clock format"
-msgid "%l:%M %P"
-msgstr "%H:%M"
-
 #. / Date format for dates within the current year, i.e. Nov 8
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:78
+#: src/client/util/util-date.vala:79
 msgid "%b %-e"
 msgstr "%-e %b."
 
-#. / Date format for dates within a different year, i.e. 02/04/10
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:83
-#, no-c-format
-msgid "%x"
-msgstr "%x"
-
 #. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:88
+#: src/client/util/util-date.vala:84
 msgid "%B %-e, %Y %-l:%M %P"
 msgstr "%-e %B %Y, %-l:%M %P"
 
 #. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:91
+#: src/client/util/util-date.vala:87
 msgid "%B %-e, %Y %-H:%M"
 msgstr "%-e %B %Y, %-H:%M"
 
 #. / Verbose datetime format for the locale default (full month, day and time)
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:94
+#: src/client/util/util-date.vala:90
 msgctxt "Default full date"
 msgid "%B %-e, %Y %-l:%M %P"
 msgstr "%-e %B %Y, %-H:%M"
 
-#: src/client/util/util-date.vala:164
+#: src/client/util/util-date.vala:159
 msgid "Now"
 msgstr "Сейчас"
 
-#: src/client/util/util-date.vala:167
+#: src/client/util/util-date.vala:162
 #, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
-msgstr[0] "%d минута назад"
-msgstr[1] "%d минуты назад"
-msgstr[2] "%d минут назад"
+msgstr[0] "%dмин назад"
+msgstr[1] "%dмин назад"
+msgstr[2] "%dмин назад"
 
-#: src/client/util/util-date.vala:171
+#: src/client/util/util-date.vala:166
 #, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
-msgstr[0] "%d час назад"
-msgstr[1] "%d часа назад"
-msgstr[2] "%d часов назад"
+msgstr[0] "%dч назад"
+msgstr[1] "%dч назад"
+msgstr[2] "%dч назад"
 
-#: src/client/util/util-date.vala:178
+#: src/client/util/util-date.vala:173
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. / Date format that shows the weekday (Monday, Tuesday, ...)
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:183
+#: src/client/util/util-date.vala:178
 #, c-format
 msgid "%A"
 msgstr "%A"
 
-#: src/client/util/util-email.vala:30 src/engine/rfc822/rfc822-message.vala:846
-msgid "(no subject)"
-msgstr "(без темы)"
-
-#. Translators: This is shown for displaying a list of
-#. email recipients that happens to be empty,
-#. i.e. contains no email addresses.
-#: src/client/util/util-email.vala:49
+#. Translators: Label used when an email has a missing or
+#. an empty subject
+#: src/client/util/util-email.vala:52
+#| msgid "(no subject)"
+msgid "(No subject)"
+msgstr "(Без темы)"
+
+#. / Translators: This is shown for displaying a list of email
+#. / recipients that happens to be empty, i.e. contains no
+#. / email addresses.
+#: src/client/util/util-email.vala:150
 msgid "(No recipients)"
 msgstr "(Нет получателей)"
 
-#. Translators: This is used for displaying a short list of
-#. email recipients lists with two or more addresses. The
-#. first (string) substitution is address of the first, the
-#. second substitution is the number of n - 1 remaining
-#. recipients.
-#: src/client/util/util-email.vala:63
+#. / Translators: This is used for displaying a short
+#. / list of email recipients lists with two or more
+#. / addresses. The first (string) substitution is
+#. / address of the first, the second substitution is
+#. / the number of n - 1 remaining recipients.
+#: src/client/util/util-email.vala:162
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
@@ -1697,9 +2604,222 @@ msgstr[0] "%s и %d другой"
 msgstr[1] "%s и %d других"
 msgstr[2] "%s и %d других"
 
-#: src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "байт"
+#. / GLib g_date_time_format format string for the date and
+#. / time that a message being replied to was
+#. / received. This should be roughly similar to an RFC
+#. / 822-style date header value with optional additional
+#. / punctuation for readability. Note that this date may
+#. / be sent to someone in a different locale than the
+#. / sender, so should be unambiguous (for example, do not
+#. / use mm/dd/yyyy since it could be confused with
+#. / dd/mm/yyyy) and must include the time zone.
+#: src/client/util/util-email.vala:194
+#| msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgid "%a, %b %-e %Y at %X %Z"
+msgstr "%a, %d.%b.%Y в %X %Z"
+
+#. / 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/client/util/util-email.vala:200
+#, 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/client/util/util-email.vala:211
+#, 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/client/util/util-email.vala:221
+#, c-format
+msgid "On %s:"
+msgstr "В %s:"
+
+#: src/client/util/util-email.vala:253
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Пересылаемое сообщение ----------"
+
+#. / Translators: Can be typed in the search box like
+#. / "attachment:file.txt" to find messages with attachments
+#. / with a particular name.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:605
+msgctxt "Search operator"
+msgid "attachment"
+msgstr "вложение"
+
+#. / Translators: Can be typed in the search box like
+#. / "bcc:johndoe example com" to find messages bcc'd to a
+#. / particular person.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:618
+msgctxt "Search operator"
+msgid "bcc"
+msgstr "скрыт.копия"
+
+#. / Translators: Can be typed in the search box like
+#. / "body:word" to find "word" only if it occurs in the body
+#. / of a message.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:630
+msgctxt "Search operator"
+msgid "body"
+msgstr "содержимое"
+
+#. / Translators: Can be typed in the search box like
+#. / "cc:johndoe example com" to find messages cc'd to a
+#. / particular person.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:642
+msgctxt "Search operator"
+msgid "cc"
+msgstr "копия"
+
+#. / Translators: Can be typed in the search box like
+#. / "from:johndoe example com" to find messages from a
+#. / particular sender.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:654
+msgctxt "Search operator"
+msgid "from"
+msgstr "от"
+
+#. / Translators: Can be typed in the search box like
+#. / "subject:word" to find "word" only if it occurs in the
+#. / subject of a message.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:668
+msgctxt "Search operator"
+msgid "subject"
+msgstr "тема"
+
+#. / Translators: Can be typed in the search box like
+#. / "to:johndoe example com" to find messages received by a
+#. / particular person.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:680
+msgctxt "Search operator"
+msgid "to"
+msgstr "кому"
+
+#. / Translators: Can be typed in the search box after "to:",
+#. / "cc:" and "bcc:" e.g.: "to:me". Matches conversations that
+#. / are addressed to the user.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:691
+msgctxt "Search operator value - mail addressed to the user"
+msgid "me"
+msgstr "вы"
+
+#. / Translators: Can be typed in the search box after "from:"
+#. / i.e.: "from:me". Matches conversations were sent by the
+#. / user.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:704
+msgctxt "Search operator value - mail sent by the user"
+msgid "me"
+msgstr "я"
+
+#. Boolean operators
+#. /////////////////////////////////////////////////////////
+#. / Translators: Can be typed in the search box like
+#. / "is:unread" to find messages that are read, unread, or
+#. / starred.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:719
+msgctxt "Search operator"
+msgid "is"
+msgstr "состояние"
+
+#. / Translators: Can be typed in the search box after "is:"
+#. / i.e.: "is:unread". Matches conversations that are flagged
+#. / unread.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:729
+msgctxt "'is:' search operator value"
+msgid "unread"
+msgstr "непрочитанное"
+
+#. / Translators: Can be typed in the search box after "is:"
+#. / i.e.: "is:read". Matches conversations that are flagged as
+#. / read.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:739
+msgctxt "'is:' search operator value"
+msgid "read"
+msgstr "прочитанное"
+
+#. / Translators: Can be typed in the search box after "is:"
+#. / i.e.: "is:starred". Matches conversations that are flagged
+#. / as starred.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:749
+msgctxt "'is:' search operator value"
+msgid "starred"
+msgstr "помеченные"
+
+#: src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "байты"
 
 #: src/client/util/util-files.vala:19
 msgctxt "Abbreviation for terabyte"
@@ -1721,271 +2841,75 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "КБ"
 
-#: src/engine/api/geary-service-information.vala:26
-msgid "IMAP"
-msgstr "IMAP"
-
-#: src/engine/api/geary-service-information.vala:29
-msgid "SMTP"
-msgstr "SMTP"
-
-#: src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
-
-#: src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
-
-#: src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
-
-#: src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Другой"
-
-#: src/engine/api/geary-special-folder-type.vala:24
+#: src/client/util/util-i18n.vala:271
 msgid "Inbox"
 msgstr "Входящие"
 
-#: src/engine/api/geary-special-folder-type.vala:27
+#: src/client/util/util-i18n.vala:274
 msgid "Drafts"
 msgstr "Черновики"
 
-#: src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
+#: src/client/util/util-i18n.vala:277
+#| msgid "Sent by:"
+msgid "Sent"
 msgstr "Отправленные"
 
-#: src/engine/api/geary-special-folder-type.vala:33
+#: src/client/util/util-i18n.vala:280
 msgid "Starred"
 msgstr "Помеченные"
 
-#: src/engine/api/geary-special-folder-type.vala:36
+#: src/client/util/util-i18n.vala:283
 msgid "Important"
 msgstr "Важное"
 
-#: src/engine/api/geary-special-folder-type.vala:39
+#: src/client/util/util-i18n.vala:286
 msgid "All Mail"
 msgstr "Вся почта"
 
-#: src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
+#: src/client/util/util-i18n.vala:289
+msgid "Junk"
 msgstr "Спам"
 
-#: src/engine/api/geary-special-folder-type.vala:45
+#: src/client/util/util-i18n.vala:292
 msgid "Trash"
 msgstr "Корзина"
 
-#: src/engine/api/geary-special-folder-type.vala:48
+#: src/client/util/util-i18n.vala:295
 msgid "Outbox"
 msgstr "Исходящие"
 
-#: src/engine/api/geary-special-folder-type.vala:54
+#: src/client/util/util-i18n.vala:301
 msgid "Archive"
 msgstr "Архив"
 
-#: src/engine/api/geary-special-folder-type.vala:58 ui/login.glade:732
-#: ui/login.glade:750
-msgid "None"
-msgstr "Нет"
-
-#. Map of possibly translated search operator names and values
-#. to English/internal names and values. We include the
-#. English version anyway so that when translations provide a
-#. localised version of the operator names but have not also
-#. translated the user manual, the English version in the
-#. manual still works.
-#. Can be typed in the search box like "attachment:file.txt"
-#. to find messages with attachments with a particular name.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-account.vala:114
-msgctxt "Search operator"
-msgid "attachment"
-msgstr "вложение"
-
-#. Can be typed in the search box like
-#. "bcc:johndoe example com" to find messages bcc'd to a
-#. particular person.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-account.vala:123
-msgctxt "Search operator"
-msgid "bcc"
-msgstr "скрыт.копия"
-
-#. Can be typed in the search box like "body:word" to find
-#. "word" only if it occurs in the body of a message.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-account.vala:131
-msgctxt "Search operator"
-msgid "body"
-msgstr "тело"
-
-#. Can be typed in the search box like
-#. "cc:johndoe example com" to find messages cc'd to a
-#. particular person.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-account.vala:140
-msgctxt "Search operator"
-msgid "cc"
-msgstr "копия"
-
-#. Can be typed in the search box like
-#. "from:johndoe example com" to find messages from a
-#. particular sender.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-account.vala:149
-msgctxt "Search operator"
-msgid "from"
-msgstr "от"
-
-#. Can be typed in the search box like "is:unread" to find
-#. messages that are read, unread, or starred.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-account.vala:157
-msgctxt "Search operator"
-msgid "is"
-msgstr "состояние"
-
-#. Can be typed in the search box like "subject:word" to find
-#. "word" only if it occurs in the subject of a message.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary
-#. User Guide.
-#: src/engine/imap-db/imap-db-account.vala:165
-msgctxt "Search operator"
-msgid "subject"
-msgstr "тема"
-
-#. Can be typed in the search box like
-#. "to:johndoe example com" to find messages received by a
-#. particular person.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-account.vala:174
-msgctxt "Search operator"
-msgid "to"
-msgstr "кому"
-
-#. Can be typed in the search box after "to:", "cc:" and
-#. "bcc:" e.g.: "to:me". Matches conversations that are
-#. addressed to the user.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-account.vala:195
-msgctxt "Search operator value - mail addressed to the user"
-msgid "me"
-msgstr "я"
-
-#. Can be typed in the search box after "from:" i.e.:
-#. "from:me". Matches conversations were sent by the user.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-account.vala:207
-msgctxt "Search operator value - mail sent by the user"
-msgid "me"
-msgstr "я"
-
-#. Can be typed in the search box after "is:" i.e.:
-#. "is:read". Matches conversations that are flagged as read.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-account.vala:219
-msgctxt "'is:' search operator value"
-msgid "read"
-msgstr "прочитанное"
-
-#. Can be typed in the search box after "is:" i.e.:
-#. "is:starred". Matches conversations that are flagged as
-#. starred.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-account.vala:230
-msgctxt "'is:' search operator value"
-msgid "starred"
-msgstr "помеченные"
-
-#. Can be typed in the search box after "is:" i.e.:
-#. "is:unread". Matches conversations that are flagged unread.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-account.vala:240
-msgctxt "'is:' search operator value"
-msgid "unread"
-msgstr "непрочитанное"
-
 #. List of general possible folder names to match for the
 #. Draft mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:870
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1006
 msgid "Drafts | Draft"
-msgstr "Черновики | Drafts | Draft"
+msgstr "Черновики | Черновик | Drafts | Draft"
 
 #. List of general possible folder names to match for the
 #. Sent mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:879
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1015
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr "Отправленные | Sent | Sent Mail | Sent Email | Sent E-Mail"
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:884
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1020
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Отправленные объекты"
 
 #. List of general possible folder names to match for the
-#. Spam mailbox. Separate names using a vertical bar and
-#. put the most common localized name to the front for the
-#. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:894
+#. Junk/Spam mailbox. Separate names using a vertical bar
+#. and put the most common localized name to the front for
+#. the default. English names do not need to be included.
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1030
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -1997,13 +2921,13 @@ msgstr ""
 #. Trash mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:904
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1040
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Корзина | Удалённые | Удаленные | Trash | Rubbish | Rubbish Bin"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:909
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1045
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Удалённые объекты"
@@ -2012,1096 +2936,1626 @@ msgstr "Удалённые объекты"
 #. Archive mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:919
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1055
 msgid "Archive | Archives"
 msgstr "Архив | Архивы | Архивированные | Archive | Archives"
 
-#. / Format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/engine/rfc822/rfc822-utils.vala:236
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %-e %b. %Y в %-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:242
-#, 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:249
-#, 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:255
-#, c-format
-msgid "On %s:"
-msgstr "В %s:"
-
-#: src/engine/rfc822/rfc822-utils.vala:282
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Пересылаемое сообщение ----------"
-
-#: src/engine/rfc822/rfc822-utils.vala:286
+#: src/engine/rfc822/rfc822-message.vala:551
 #, c-format
-msgid "From: %s\n"
-msgstr "От: %s\n"
+msgid "Could not determine mime type for “%s”."
+msgstr "Не удалось определить mime-тип для “%s”."
 
-#: src/engine/rfc822/rfc822-utils.vala:287
+#: src/engine/rfc822/rfc822-message.vala:562
 #, c-format
-msgid "Subject: %s\n"
-msgstr "Тема: %s\n"
+msgid "Could not determine content type for mime type “%s” on “%s”."
+msgstr "Не удалось определить тип содержимого для mime-типа \"%s\" в \"%s\"."
 
-#: src/engine/rfc822/rfc822-utils.vala:288
-#, c-format
-msgid "Date: %s\n"
-msgstr "Дата: %s\n"
-
-#: src/engine/rfc822/rfc822-utils.vala:291
-#, c-format
-msgid "To: %s\n"
-msgstr "Кому: %s\n"
+#: src/engine/rfc822/rfc822-message.vala:1015
+msgid "(no subject)"
+msgstr "(без темы)"
 
-#: src/engine/rfc822/rfc822-utils.vala:294
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Копия: %s\n"
+#: ui/accounts_editor_add_pane.ui:7 ui/accounts_editor_list_pane.ui:122
+#| msgid "Add account"
+msgid "Add an account"
+msgstr "Добавить учетную запись"
+
+#: ui/accounts_editor_add_pane.ui:47
+msgid "_Create"
+msgstr "_Создать"
+
+#: ui/accounts_editor_add_pane.ui:119 ui/accounts_editor_servers_pane.ui:115
+msgid "Receiving"
+msgstr "Получение"
+
+#: ui/accounts_editor_add_pane.ui:163 ui/accounts_editor_servers_pane.ui:151
+#| msgid "Sending…"
+msgid "Sending"
+msgstr "Отправление"
+
+#: ui/accounts_editor_edit_pane.ui:7
+#| msgid "Edit account"
+msgid "Edit Account"
+msgstr "Редактировать Учетную запись"
+
+#: ui/accounts_editor_edit_pane.ui:8 ui/accounts_editor_servers_pane.ui:8
+#| msgid "Accounts"
+msgid "Account Name"
+msgstr "Имя Учетной записи"
+
+#: ui/accounts_editor_edit_pane.ui:114
+#| msgid "Email address:"
+msgid "Email addresses"
+msgstr "Адрес эл. почты"
+
+#: ui/accounts_editor_edit_pane.ui:151
+msgid "Signature"
+msgstr "Подпись"
+
+#: ui/accounts_editor_edit_pane.ui:186
+#| msgid "SMTP settings"
+msgid "Settings"
+msgstr "Параметры"
 
-#: ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Невозможно удалить учётную запись</"
-"span> "
+#. This is a button in the account settings to show server settings.
+#: ui/accounts_editor_edit_pane.ui:225 ui/accounts_editor_servers_pane.ui:7
+#| msgid "SMTP settings"
+msgid "Server Settings"
+msgstr "Параметры Сервера"
 
-#: ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Открыто окно редактирования писем, связанное с данной учётной записью. "
-"Отправьте письмо или отмените его, затем попробуйте снова."
+#: ui/accounts_editor_edit_pane.ui:242
+#| msgid "Remove account"
+msgid "Remove this account from Geary"
+msgstr "Удалить этот аккаунт из Geary"
 
-#: ui/account_list.glade:69
-msgid "Add account"
-msgstr "Добавить учётную запись"
+#: ui/accounts_editor_list_pane.ui:7
+msgid "Accounts"
+msgstr "Учетные записи"
 
-#: ui/account_list.glade:82
-msgid "Edit account"
-msgstr "Редактировать учётную запись"
+#: ui/accounts_editor_list_pane.ui:59
+msgid "To get started, select an email provider below."
+msgstr "Чтобы начать работу, выберите ниже поставщика услуг эл. почты."
 
-#: ui/account_list.glade:95
-msgid "Remove account"
-msgstr "Удалить учётную запись"
+#: ui/accounts_editor_list_pane.ui:73
+#| msgid "Welcome to Geary."
+msgid "Welcome to Geary"
+msgstr "Добро пожаловать в Geary"
 
-#: ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
-msgstr "Подождите пока Geary проверит учётную запись."
+#: ui/accounts_editor_servers_pane.ui:42
+msgid "Apply"
+msgstr "Применить"
 
-#: ui/certificate_warning_dialog.glade:7
+#: ui/certificate_warning_dialog.glade:6
 msgid "Untrusted Connection"
-msgstr "Недоверенное соединение"
+msgstr "Недоверенное Соединение"
 
-#: ui/certificate_warning_dialog.glade:29
+#: ui/certificate_warning_dialog.glade:26
 msgid "_Always Trust This Server"
-msgstr "_Всегда доверять этому серверу"
+msgstr "_Всегда Доверять Этому Серверу"
 
-#: ui/certificate_warning_dialog.glade:43
+#: ui/certificate_warning_dialog.glade:39
 msgid "_Trust This Server"
-msgstr "_Доверять этому серверу"
+msgstr "_Доверять Этому Серверу"
 
-#: ui/certificate_warning_dialog.glade:57
+#: ui/certificate_warning_dialog.glade:52
 msgid "_Don’t Trust This Server"
-msgstr "_Не доверять этому серверу"
-
-#: ui/composer-headerbar.ui:17 ui/composer-headerbar.ui:174
-msgid "Detach (Ctrl+D)"
-msgstr "Открепить (Ctrl+D)"
-
-#: ui/composer-headerbar.ui:57 ui/composer-headerbar.ui:83
-msgid "Attach File (Ctrl+T)"
-msgstr "Вложить файл (Ctrl+T)"
-
-#: ui/composer-headerbar.ui:107
-msgid "Include Original Attachments"
-msgstr "Включить исходные вложения"
-
-#: ui/composer-headerbar.ui:202
-msgid "_Send"
-msgstr "_Отправить"
-
-#: ui/composer-headerbar.ui:207
-msgid "Send (Ctrl+Enter)"
-msgstr "Отправить (Ctrl+Enter)"
-
-#: ui/composer-headerbar.ui:230
-msgid "Discard and Close"
-msgstr "Отказаться от изменений и закрыть"
-
-#: ui/composer-headerbar.ui:254
-msgid "Save and Close"
-msgstr "Сохранить и закрыть"
-
-#. Note that this button and the Update button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:41
-msgid "Insert the new link with this URL"
-msgstr "Вставить новую ссылку с этим URL"
-
-#: ui/composer-link-popover.ui:52
-msgid "Link URL"
-msgstr "Ссылка URL"
+msgstr "_Не Доверять Этому Серверу"
 
-#. Note that this button and the Insert button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:66
-msgid "Update this link’s URL"
-msgstr "Обновить URL ссылки"
+#: ui/composer-editor.ui:89
+#| msgctxt "shortcut window"
+#| msgid "Bold text"
+msgid "Bold text"
+msgstr "Полужирный текст"
 
-#: ui/composer-link-popover.ui:86
-msgid "Delete this link"
-msgstr "Удалить эту ссылку"
+#: ui/composer-editor.ui:111
+#| msgctxt "shortcut window"
+#| msgid "Italicize text"
+msgid "Italic text"
+msgstr "Текст курсивом"
 
-#: ui/composer-link-popover.ui:106
-msgid "Open this link"
-msgstr "Открыть эту ссылку"
+#: ui/composer-editor.ui:133
+#| msgctxt "shortcut window"
+#| msgid "Underline text"
+msgid "Underline text"
+msgstr "Подчеркнутый текст"
+
+#: ui/composer-editor.ui:155
+#| msgctxt "shortcut window"
+#| msgid "Strike text"
+msgid "Strikethrough text"
+msgstr "Зачеркнутый текст"
+
+#: ui/composer-editor.ui:185
+#| msgid "Insert unordered list"
+msgid "Insert bulleted list"
+msgstr "Вставить маркированный список"
+
+#: ui/composer-editor.ui:207
+#| msgid "Insert unordered list"
+msgid "Insert numbered list"
+msgstr "Вставить нумерованный список"
+
+#: ui/composer-editor.ui:237
+#| msgctxt "shortcut window"
+#| msgid "Unquote text"
+msgid "Indent or quote text"
+msgstr "Добавить отступы или цитирование текста"
+
+#: ui/composer-editor.ui:259
+#| msgctxt "shortcut window"
+#| msgid "Unquote text"
+msgid "Un-indent or unquote text"
+msgstr "Отменить отступы или цитирование текста"
+
+#: ui/composer-editor.ui:286
+#| msgctxt "shortcut window"
+#| msgid "Remove formatting"
+msgid "Remove text formatting"
+msgstr "Удалить форматирование текста"
+
+#: ui/composer-editor.ui:303
+msgid "Change font type"
+msgstr "Изменить тип шрифта"
+
+#: ui/composer-editor.ui:315
+msgid "Sans Serif"
+msgstr "Без Засечек"
+
+#: ui/composer-editor.ui:325
+msgid "Serif"
+msgstr "С Засечками"
+
+#: ui/composer-editor.ui:335
+msgid "Fixed Width"
+msgstr "Фиксированная Ширина"
+
+#: ui/composer-editor.ui:359
+msgid "Change font color"
+msgstr "Изменить цвет шрифта"
+
+#: ui/composer-editor.ui:372
+msgid "Change font size"
+msgstr "Изменить размер шрифта"
+
+#: ui/composer-editor.ui:402
+#| msgid "Insert or update selection link (Ctrl+L)"
+msgid "Insert or update text link"
+msgstr "Вставить или обновить текстовую ссылку"
+
+#: ui/composer-editor.ui:424
+#| msgid "Insert an image (Ctrl+G)"
+msgid "Insert an image"
+msgstr "Вставить изображение"
+
+#: ui/composer-editor.ui:463
+#| msgid "Undo last edit (Ctrl+Z)"
+msgid "Undo last edit"
+msgstr "Отменить последнее редактирование"
+
+#: ui/composer-editor.ui:485
+#| msgid "Undo last edit (Ctrl+Z)"
+msgid "Redo last edit"
+msgstr "Повторить последнее редактирование"
+
+#: ui/composer-editor.ui:512 ui/composer-editor.ui:534
+#| msgid "_Attach File"
+msgid "Attach a file"
+msgstr "Вложить файл"
+
+#: ui/composer-editor.ui:556
+#| msgid "Include Original Attachments"
+msgid "Add original attachments"
+msgstr "Добавить исходные вложения"
+
+#: ui/composer-editor.ui:598
+msgid "More options"
+msgstr "Дополнительные параметры"
+
+#: ui/composer-editor.ui:617
+msgid "Show formatting toolbar"
+msgstr "Показать панель форматирования"
+
+#: ui/composer-editor.ui:634
+msgid "Select spell checking languages"
+msgstr "Выберите языки проверки орфографии"
 
-#: ui/composer-menus.ui:7
+#: ui/composer-editor.ui:658
 msgid "S_ans Serif"
-msgstr "_Без засечек"
+msgstr "Б_ез Засечек"
 
-#: ui/composer-menus.ui:12
+#: ui/composer-editor.ui:663
 msgid "S_erif"
-msgstr "_С засечками"
+msgstr "С_ Засечками"
 
-#: ui/composer-menus.ui:17
+#: ui/composer-editor.ui:668
 msgid "_Fixed Width"
-msgstr "_Моноширинный"
+msgstr "_Фиксированная Ширина"
 
-#: ui/composer-menus.ui:24
+#: ui/composer-editor.ui:678
 msgid "_Small"
 msgstr "_Мелкий"
 
-#: ui/composer-menus.ui:29
+#: ui/composer-editor.ui:683
 msgid "_Medium"
 msgstr "_Средний"
 
-#: ui/composer-menus.ui:34
+#: ui/composer-editor.ui:688
 msgid "Lar_ge"
 msgstr "Круп_ный"
 
-#: ui/composer-menus.ui:41
-msgid "C_olor"
-msgstr "_Цвет"
-
-#: ui/composer-menus.ui:47 ui/composer-menus.ui:62
+#: ui/composer-editor.ui:698
 msgid "_Rich Text"
-msgstr "Текст с оформлением"
+msgstr "_Форматированный Текст"
 
-#: ui/composer-menus.ui:53 ui/composer-menus.ui:68
-msgid "Show Extended Fields"
-msgstr "Показывать дополнительные поля"
+#: ui/composer-editor.ui:703
+#| msgid "_Rich Text"
+msgid "_Plain Text"
+msgstr "_Простой Текст"
 
-#: ui/composer-menus.ui:78
+#: ui/composer-editor-menus.ui:8
 msgid "_Undo"
 msgstr "_Отменить"
 
-#: ui/composer-menus.ui:82
+#: ui/composer-editor-menus.ui:12
 msgid "_Redo"
-msgstr "В_ернуть"
+msgstr "_Повторить"
 
-#: ui/composer-menus.ui:88 ui/composer-menus.ui:106
+#: ui/composer-editor-menus.ui:18 ui/composer-editor-menus.ui:36
 msgid "Cu_t"
-msgstr "_Вырезать"
+msgstr "Вы_резать"
 
-#: ui/composer-menus.ui:92 ui/composer-menus.ui:110
+#: ui/composer-editor-menus.ui:22 ui/composer-editor-menus.ui:40
 #: ui/conversation-message-menus.ui:37
 msgid "_Copy"
 msgstr "_Копировать"
 
-#: ui/composer-menus.ui:96 ui/composer-menus.ui:114
+#: ui/composer-editor-menus.ui:26 ui/composer-editor-menus.ui:44
 msgid "_Paste"
-msgstr "В_ставить"
+msgstr "_Вставить"
 
-#: ui/composer-menus.ui:100
+#: ui/composer-editor-menus.ui:30
 msgctxt "Clipboard paste as plain text"
 msgid "Paste _Without Formatting"
-msgstr "Вставить бе_з форматирования"
+msgstr "Вставить_Без Форматирования"
 
-#: ui/composer-menus.ui:120
+#: ui/composer-editor-menus.ui:50
 msgid "Select _All"
-msgstr "Выбрать _все"
+msgstr "Выбрать _Все"
 
-#: ui/composer-menus.ui:127 ui/conversation-message-menus.ui:49
+#: ui/composer-editor-menus.ui:57 ui/conversation-message-menus.ui:43
 msgid "_Inspect…"
 msgstr "_Проверить…"
 
-#. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:56
-msgid "_To"
-msgstr "_Кому"
+#: ui/composer-headerbar.ui:20 ui/composer-headerbar.ui:96
+#| msgctxt "shortcut window"
+#| msgid "Detach composer window"
+msgid "Detach the composer from the window"
+msgstr "Отсоединить окно редактора от основного окна"
 
-#: ui/composer-widget.ui:75
-msgid "_Cc"
-msgstr "Ко_пия"
+#: ui/composer-headerbar.ui:123
+msgid "_Send"
+msgstr "_Отправить"
 
-#: ui/composer-widget.ui:130
-msgid "_Subject"
-msgstr "_Тема"
+#: ui/composer-headerbar.ui:147
+msgid "Discard and Close"
+msgstr "Отказаться от изменений и Закрыть"
 
-#: ui/composer-widget.ui:149
-msgid "_Bcc"
-msgstr "_Скрытая копия"
+#: ui/composer-headerbar.ui:169
+msgid "Save and Close"
+msgstr "Сохранить и Закрыть"
 
-#: ui/composer-widget.ui:179
-msgid "_Reply-To"
-msgstr "_Ответить"
+#. Note that this button and the Update button will never be shown at the same time to the user.
+#: ui/composer-link-popover.ui:38
+msgid "Insert the new link with this URL"
+msgstr "Вставить новую ссылку с этим URL"
+
+#: ui/composer-link-popover.ui:39
+#| msgid "_Add"
+msgid "Add"
+msgstr "Добавить"
+
+#: ui/composer-link-popover.ui:43
+msgid "Link URL"
+msgstr "Ссылка URL"
+
+#. Note that this button and the Insert button will never be shown at the same time to the user.
+#: ui/composer-link-popover.ui:56
+msgid "Update this link’s URL"
+msgstr "Обновить URL ссылки"
 
-#. Geary account mail will be sent from
-#: ui/composer-widget.ui:208
-msgid "From"
-msgstr "От"
+#: ui/composer-link-popover.ui:57
+#| msgid "_Update"
+msgid "Update"
+msgstr "Обновить"
+
+#: ui/composer-link-popover.ui:69
+msgid "Delete this link"
+msgstr "Удалить эту ссылку"
 
-#: ui/composer-widget.ui:293
+#: ui/composer-widget.ui:119
 msgid "Drop files here"
 msgstr "Перетащите файлы сюда"
 
-#: ui/composer-widget.ui:309
+#: ui/composer-widget.ui:134
 msgid "To add them as attachments"
-msgstr "чтобы добавить их как вложения"
+msgstr "Чтобы добавить их как вложения"
+
+#: ui/composer-widget.ui:217
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr "Показывать поля Копия, Скрытая Копия и Ответить"
+
+#: ui/components-attachment-pane.ui:25 ui/components-attachment-pane.ui:41
+msgid "Select all attachments"
+msgstr "Выбрать все вложения"
+
+#: ui/components-attachment-pane.ui:58
+msgid "Save selected attachments"
+msgstr "Сохранить выбранные вложения"
+
+#: ui/components-attachment-pane.ui:75
+msgid "Open selected attachments"
+msgstr "Открыть выбранные вложения"
 
-#: ui/composer-widget.ui:348
-msgid "Undo last edit (Ctrl+Z)"
-msgstr "Отменить последние изменения (Ctrl+Z)"
+#: ui/components-attachment-pane-menus.ui:17
+#| msgid "_Save All"
+msgid "Save _All"
+msgstr "Сохранить _Все"
+
+#: ui/components-conversation-actions.ui:17
+msgid "Reply"
+msgstr "Ответить"
 
-#: ui/composer-widget.ui:372
-msgid "Redo last edit  (Ctrl+Shift+Z)"
-msgstr "Вернуть последние изменения (Ctrl+Shift+Z)"
+#: ui/components-conversation-actions.ui:38
+msgid "Reply All"
+msgstr "Ответить Всем"
 
-#: ui/composer-widget.ui:410
-msgid "Bold (Ctrl+B)"
-msgstr "Жирный (Ctrl+B)"
+#: ui/components-conversation-actions.ui:59
+msgid "Forward"
+msgstr "Переслать"
 
-#: ui/composer-widget.ui:434
-msgid "Italic (Ctrl+I)"
-msgstr "Курсив (Ctrl+I)"
+#: ui/components-conversation-actions.ui:156
+msgid "_Archive"
+msgstr "_Архивировать"
 
-#: ui/composer-widget.ui:458
-msgid "Underline (Ctrl+U)"
-msgstr "Подчёркнутый (Ctrl+U)"
+#: ui/components-inspector-error-view.ui:27
+#| msgid ""
+#| "If the problem is serious or persists, please copy and send these details "
+#| "to the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing "
+#| "list</a> or file a <a href=\"https://wiki.gnome.org/Apps/Geary/";
+#| "ReportingABug\">new bug report</a>."
+msgid ""
+"If the problem is serious or persists, please save and send these details to "
+"one of the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>contact "
+"channels</a> or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/";
+"ReportingABug\">new bug report</a>."
+msgstr ""
+"Если проблема серьезная или сохраняется, скопируйте и отправьте эти данные "
+"одному из <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>каналов "
+"связи</a> или прикрепите к <a href=\"https://wiki.gnome.org/Apps/Geary/";
+"ReportingABug\">новому отчету об ошибке</a>."
 
-#: ui/composer-widget.ui:482
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Зачёркнутый (Ctrl+K)"
+#: ui/components-inspector-error-view.ui:42
+msgid "Details:"
+msgstr "Подробности:"
 
-#: ui/composer-widget.ui:520
-msgid "Insert unordered list"
-msgstr "Вставить неупорядоченный список"
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:16 ui/problem-details-dialog.ui:21
+#| msgid "Search for more languages"
+msgid "Search for matching log entries"
+msgstr "Поиск соответствующих записей в журнале"
+
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:30
+msgid "Toggle appending new log entries"
+msgstr "Включить добавление новых записей журнала"
+
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:48
+msgid "Add a marker entry to the log"
+msgstr "Добавить запись с пометкой в журнал"
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:71 ui/problem-details-dialog.ui:45
+msgid "Save logs entries and details"
+msgstr "Сохранить записи журнала и подробности"
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:89 ui/problem-details-dialog.ui:60
+#| msgid "Copy to Clipboard"
+msgid "Copy to clipboard"
+msgstr "Скопировать в буфер обмена"
 
-#: ui/composer-widget.ui:544
-msgid "Insert ordered list"
-msgstr "Вставить упорядоченный список"
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:107
+msgid "Clears all log entries"
+msgstr "Удалить все записи журнала"
 
-#: ui/composer-widget.ui:582
-msgid "Quote text  (Ctrl+])"
-msgstr "Цитировать текст (Ctrl+])"
+#: ui/components-main-toolbar.ui:72 ui/components-main-toolbar.ui:158
+msgid "Back"
+msgstr "Назад"
 
-#: ui/composer-widget.ui:606
-msgid "Unquote text  (Ctrl+[)"
-msgstr "Убрать цитирование текста (Ctrl+[)"
+#: ui/components-main-toolbar.ui:89
+#| msgid "Compose Message"
+msgctxt "tooltip"
+msgid "Compose Message"
+msgstr "Написать Сообщение"
 
-#: ui/composer-widget.ui:644
-msgid "Insert or update selection link (Ctrl+L)"
-msgstr "Вставить или обновить выбранную ссылку (Ctrl+L)"
+#: ui/components-main-toolbar.ui:105
+msgid "Toggle search bar"
+msgstr "Переключить панель поиска"
 
-#: ui/composer-widget.ui:668
-msgid "Insert an image (Ctrl+G)"
-msgstr "Вставить изображение (Ctrl+G)"
+#: ui/components-main-toolbar.ui:195
+msgid "Toggle find bar"
+msgstr "Включить или отключить полосу поиска"
 
-#: ui/composer-widget.ui:702
-msgid "Remove selection formatting (Ctrl+Space)"
-msgstr "Убрать форматирование выбранного (Ctrl+Space)"
+#: ui/components-main-toolbar-menus.ui:21
+#| msgctxt "shortcut window"
+#| msgid "Toggle spam"
+msgid "Toggle as _Junk"
+msgstr "Переключить метку _Спам"
 
-#: ui/composer-widget.ui:726
-msgid "Select spell checking languages"
-msgstr "Выберите языки проверки орфографии"
+#: ui/components-main-toolbar-menus.ui:28
+#| msgid "Accounts"
+msgid "_Accounts"
+msgstr "_Учётные записи"
 
-#: ui/conversation-email.ui:27
+#: ui/components-main-toolbar-menus.ui:36
+msgid "_Keyboard Shortcuts"
+msgstr "_Горячие Клавиши"
+
+#: ui/components-main-toolbar-menus.ui:47
+#| msgid "_About"
+msgid "_About Geary"
+msgstr "_Про Geary"
+
+#: ui/conversation-contact-popover.ui:134
+#| msgid "Move conversation"
+msgid "New Conversation…"
+msgstr "Новая Беседа..."
+
+#: ui/conversation-contact-popover.ui:146
+#| msgid "Copy Email _Address"
+msgid "Copy Email Address"
+msgstr "Копировать Эл.адрес Почты"
+
+#: ui/conversation-contact-popover.ui:167
+#| msgid "Save and Close"
+msgid "Save in Contacts…"
+msgstr "Сохранить в Контактах..."
+
+#: ui/conversation-contact-popover.ui:179
+#| msgid "Move conversations"
+msgid "Show Conversations"
+msgstr "Показать Беседы"
+
+#: ui/conversation-contact-popover.ui:191
+msgid "Open in Contacts"
+msgstr "Открыть в Контактах"
+
+#: ui/conversation-contact-popover.ui:203
+msgid "Always Load Remote Images"
+msgstr "Всегда Загружать Сторонние Изображения"
+
+#. Title label on contact popover
+#: ui/conversation-contact-popover.ui:242
+#| msgid "Remove email address"
+msgid "Deceptive email address"
+msgstr "Обманчивый адрес эл. почты"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:270
+#| msgid "Email address:"
+msgid "This email address is:"
+msgstr "Этот адрес эл. почты:"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:293
+msgid "But was forged as:"
+msgstr "Но был подделан как:"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:316
+msgid "The sender may not be trustworthy"
+msgstr "Отправитель может быть ненадежным"
+
+#: ui/conversation-email.ui:24
 msgid "Save all attachments"
 msgstr "Сохранить все вложения"
 
 #. Note: The application will never show this button at the same time as unstar_button, one will always be 
hidden.
-#: ui/conversation-email.ui:50
+#: ui/conversation-email.ui:45
 msgid "Mark this message as starred"
 msgstr "Отметить это сообщение как помеченное"
 
 #. Note: The application will never show this button at the same time as star_button, one will always be 
hidden.
-#: ui/conversation-email.ui:72
+#: ui/conversation-email.ui:65
 msgid "Mark this message as not starred"
 msgstr "Отметить это сообщение как не помеченное"
 
-#: ui/conversation-email.ui:95
-msgid "Display the message menu"
-msgstr "Показать меню сообщений"
+#. Translators: Menu item to reply to a specific message.
+#: ui/conversation-email-menus.ui:15
+msgid "Reply to _All"
+msgstr "Ответить _Всем"
 
-#: ui/conversation-email.ui:161
-msgid "Open selected attachments"
-msgstr "Открыть выбранные вложения"
+#. Translators: Menu item to mark a specific message as
+#. read.
+#: ui/conversation-email-menus.ui:30
+msgid "_Mark Read"
+msgstr "_Отметить как Прочитанное"
 
-#: ui/conversation-email.ui:178
-msgid "Save selected attachments"
-msgstr "Сохранить выбранные вложения"
+#: ui/conversation-email-menus.ui:36
+msgid "_Mark Unread"
+msgstr "_Отметить как Непрочитанное"
 
-#: ui/conversation-email.ui:195
-msgid "Select all attachments"
-msgstr "Сохранить все вложения"
+#. Translators: Menu item to mark all messages in a
+#. conversation from this one as unread.
+#: ui/conversation-email-menus.ui:42
+msgid "Mark Unread From _Here"
+msgstr "Отметить как Непрочитанное начиная с _Этого"
 
-#: ui/conversation-email.ui:240
-msgid "Edit Draft"
-msgstr "Редактировать черновик"
+#. Translators: Menu item to move a single, specific message
+#. to the trash folder
+#: ui/conversation-email-menus.ui:50
+#| msgctxt "shortcut window"
+#| msgid "Move to trash"
+msgid "Move message to _Trash"
+msgstr "Переместить сообщение в _Корзину"
 
-#: ui/conversation-email.ui:267
-msgid "Draft message"
-msgstr "Черновое сообщение"
+#. Translators: Menu item to delete a single, specific message
+#: ui/conversation-email-menus.ui:57
+#| msgid "_Delete…"
+msgid "_Delete message…"
+msgstr "_Удалить сообщение…"
 
-#: ui/conversation-email.ui:283
-msgid "This message has not yet been sent."
-msgstr "Это сообщение ещё не было отправлено."
+#. Translators: Menu item to view the source for a message
+#: ui/conversation-email-menus.ui:69
+msgid "_View Source"
+msgstr "_Посмотреть Источник"
 
-#: ui/conversation-email.ui:329
-msgid "Message not saved"
-msgstr "Сообщение не сохранено"
+#: ui/conversation-message-link-popover.ui:49
+msgid "But actually goes to:"
+msgstr "Но на самом деле ведёт на:"
 
-#: ui/conversation-email.ui:345
-msgid "This message was sent, but has not been saved to your account."
-msgstr "Сообщение отправлено, но не сохранено в вашей учётной записи."
+#: ui/conversation-message-link-popover.ui:77
+msgid "The link appears to go to:"
+msgstr "Кажется что эта ссылка ведёт на:"
 
-#. Translators: Menu item to reply to a specific message.
-#: ui/conversation-email-menus.ui:15
-msgid "Reply to _All"
-msgstr "Ответить _всем"
+#: ui/conversation-message-link-popover.ui:88
+msgid "Deceptive link found"
+msgstr "Найдена ссылка с перенаправлением"
 
-#. Translators: Menu item to mark a specific message as
-#. read.
-#: ui/conversation-email-menus.ui:30
-msgid "_Mark Read"
-msgstr "Отметить как _прочитанное"
+#: ui/conversation-message-link-popover.ui:102
+msgid "The email sender may be leading you to the wrong web site."
+msgstr "Отправитель письма возможно ведёт вас на ложный веб-сайт."
 
-#: ui/conversation-email-menus.ui:36
-msgid "_Mark Unread"
-msgstr "Отметить как _непрочитанное"
+#: ui/conversation-message-link-popover.ui:114
+msgid "If unsure, contact the sender and ask before continuing."
+msgstr ""
+"Если вы не уверены, обратитесь к отправителю и спросите, прежде чем "
+"продолжить."
 
-#. Translators: Menu item to mark all messages in a
-#. conversation from this one as unread.
-#: ui/conversation-email-menus.ui:42
-msgid "Mark Unread From _Here"
-msgstr "Отметить как непрочитанные начиная с _этого"
+#: ui/conversation-message-menus.ui:7
+msgid "_Open Link"
+msgstr "_Открыть Ссылку"
+
+#: ui/conversation-message-menus.ui:11
+msgid "Copy Link _Address"
+msgstr "Копировать Адрес _Ссылки"
+
+#: ui/conversation-message-menus.ui:17
+#| msgid "Move conversation"
+msgid "_New Conversation…"
+msgstr "_Новая Беседа..."
+
+#: ui/conversation-message-menus.ui:21
+msgid "Copy Email _Address"
+msgstr "Копировать Адрес _Почты"
+
+#: ui/conversation-message-menus.ui:27
+msgid "Save _Image As…"
+msgstr "Сохранить _Изображение Как…"
+
+#: ui/conversation-message-menus.ui:33
+msgid "_Select All"
+msgstr "_Выбрать Все"
+
+#: ui/conversation-message.ui:54
+msgid "From <email>"
+msgstr "От <email>"
+
+#: ui/conversation-message.ui:69 ui/conversation-message.ui:160
+msgid "1/1/1970\t"
+msgstr "1/1/1970\t"
+
+#: ui/conversation-message.ui:91
+msgid "Preview body text."
+msgstr "Предпросмотр основного текста."
+
+#: ui/conversation-message.ui:182
+msgid "Sent by:"
+msgstr "Отправлено:"
+
+#: ui/conversation-message.ui:223
+msgid "Reply to:"
+msgstr "Ответить:"
+
+#: ui/conversation-message.ui:264
+msgid "Subject"
+msgstr "Тема"
+
+#: ui/conversation-viewer.ui:53
+msgid "Find in conversation"
+msgstr "Найти в беседе"
+
+#: ui/conversation-viewer.ui:67
+msgid "Find the previous occurrence of the search string."
+msgstr "Найти предыдущее совпадение строки поиска."
+
+#: ui/conversation-viewer.ui:86
+msgid "Find the next occurrence of the search string."
+msgstr "Найти следующее совпадение строки поиска."
+
+#: ui/find_bar.glade:58
+msgid "Find:"
+msgstr "Найти:"
+
+#: ui/find_bar.glade:80
+msgid "_Previous"
+msgstr "_Предыдущее"
+
+#: ui/find_bar.glade:97
+msgid "_Next"
+msgstr "_Следующее"
+
+#: ui/find_bar.glade:114
+msgid "_Case sensitive"
+msgstr "_Учитывать регистр"
+
+#: ui/find_bar.glade:132
+msgid "label"
+msgstr "метка"
+
+#: ui/gtk/help-overlay.ui:8
+msgid "Conversation Shortcuts"
+msgstr "Горячие Клавиши для Беседы"
+
+#: ui/gtk/help-overlay.ui:12 ui/gtk/help-overlay.ui:194
+msgctxt "shortcut window"
+msgid "Actions"
+msgstr "Действия"
+
+#: ui/gtk/help-overlay.ui:16
+#| msgid "Move conversation"
+msgctxt "shortcut window"
+msgid "New conversation"
+msgstr "Новая беседа"
+
+#: ui/gtk/help-overlay.ui:23
+#| msgctxt "shortcut window"
+#| msgid "Reply to sender "
+msgctxt "shortcut window"
+msgid "Reply to sender"
+msgstr "Ответить отправителю"
+
+#: ui/gtk/help-overlay.ui:30 ui/gtk/help-overlay.ui:450
+msgctxt "shortcut window"
+msgid "Reply to all"
+msgstr "Ответить всем"
+
+#: ui/gtk/help-overlay.ui:37 ui/gtk/help-overlay.ui:457
+msgctxt "shortcut window"
+msgid "Forward"
+msgstr "Переслать"
+
+#: ui/gtk/help-overlay.ui:44 ui/gtk/help-overlay.ui:464
+#| msgctxt "shortcut window"
+#| msgid "Mark read"
+msgctxt "shortcut window"
+msgid "Un-mark/mark read"
+msgstr "Снять отметку/пометить прочитанным"
+
+#: ui/gtk/help-overlay.ui:51 ui/gtk/help-overlay.ui:471
+msgctxt "shortcut window"
+msgid "Mark/un-mark starred"
+msgstr "Отметить/снять отметку помеченным"
+
+#: ui/gtk/help-overlay.ui:58 ui/gtk/help-overlay.ui:478
+#| msgid "Archive conversations (A)"
+msgctxt "shortcut window"
+msgid "Archive conversations"
+msgstr "Архивировать беседы"
+
+#: ui/gtk/help-overlay.ui:65 ui/gtk/help-overlay.ui:495
+#| msgid "Move conversations"
+msgctxt "shortcut window"
+msgid "Move conversations"
+msgstr "Переместить беседы"
+
+#: ui/gtk/help-overlay.ui:72 ui/gtk/help-overlay.ui:502
+#| msgctxt "shortcut window"
+#| msgid "Label the conversation"
+msgctxt "shortcut window"
+msgid "Label conversations"
+msgstr "Отметить беседы"
+
+#: ui/gtk/help-overlay.ui:79
+#| msgid "Mark conversations"
+msgctxt "shortcut window"
+msgid "Trash conversations"
+msgstr "Отправить беседы в корзину"
+
+#: ui/gtk/help-overlay.ui:86 ui/gtk/help-overlay.ui:509
+#| msgid "Mark conversations"
+msgctxt "shortcut window"
+msgid "Junk conversations"
+msgstr "Отправить беседы в спам"
+
+#: ui/gtk/help-overlay.ui:94 ui/gtk/help-overlay.ui:516
+#| msgid "Delete conversation"
+msgctxt "shortcut window"
+msgid "Delete conversations"
+msgstr "Удалить беседы"
+
+#: ui/gtk/help-overlay.ui:103
+msgctxt "shortcut window"
+msgid "Search"
+msgstr "Поиск"
+
+#: ui/gtk/help-overlay.ui:107
+#| msgid "Mark conversations"
+msgctxt "shortcut window"
+msgid "Search for conversations"
+msgstr "Поиск по беседам"
+
+#: ui/gtk/help-overlay.ui:114 ui/gtk/help-overlay.ui:523
+msgctxt "shortcut window"
+msgid "Find in current conversation"
+msgstr "Найти в текущей беседе"
+
+#: ui/gtk/help-overlay.ui:140
+#| msgid "_Undo"
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr "Отменить"
+
+#: ui/gtk/help-overlay.ui:144
+msgctxt "shortcut window"
+msgid "Undo the last action"
+msgstr "Отменить последнее действие"
+
+#: ui/gtk/help-overlay.ui:151
+msgctxt "shortcut window"
+msgid "Redo the last action"
+msgstr "Повторить последнее действие"
+
+#: ui/gtk/help-overlay.ui:160
+msgctxt "shortcut window"
+msgid "View"
+msgstr "Вид"
+
+#: ui/gtk/help-overlay.ui:164
+msgctxt "shortcut window"
+msgid "Zoom in"
+msgstr "Приблизить"
+
+#: ui/gtk/help-overlay.ui:171
+msgctxt "shortcut window"
+msgid "Zoom out"
+msgstr "Отдалить"
+
+#: ui/gtk/help-overlay.ui:178
+msgctxt "shortcut window"
+msgid "Reset zoom"
+msgstr "Сбросить масштаб"
+
+#: ui/gtk/help-overlay.ui:190
+msgid "Composer Shortcuts"
+msgstr "Горячие Клавиши для Редактора"
+
+#: ui/gtk/help-overlay.ui:198
+msgctxt "shortcut window"
+msgid "Send"
+msgstr "Отправить"
+
+#: ui/gtk/help-overlay.ui:205
+msgctxt "shortcut window"
+msgid "Add attachment"
+msgstr "Добавить вложение"
+
+#: ui/gtk/help-overlay.ui:212
+#| msgctxt "shortcut window"
+#| msgid "Detach composer window"
+msgctxt "shortcut window"
+msgid "Detach the composer"
+msgstr "Отсоединить редактор"
+
+#: ui/gtk/help-overlay.ui:221 ui/gtk/help-overlay.ui:350
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Основное"
+
+#: ui/gtk/help-overlay.ui:225
+msgctxt "shortcut window"
+msgid "Close composer window"
+msgstr "Закрыть окно редактора"
+
+#: ui/gtk/help-overlay.ui:232
+msgctxt "shortcut window"
+msgid "Detach composer window"
+msgstr "Отсоединить окно редактора"
+
+#: ui/gtk/help-overlay.ui:239
+#| msgid "Edit"
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Редактирование"
+
+#: ui/gtk/help-overlay.ui:244
+msgctxt "shortcut window"
+msgid "Move selection to the clipboard"
+msgstr "Переместить выделенное в буфер обмена"
+
+#: ui/gtk/help-overlay.ui:251
+#| msgid "Copy to Clipboard"
+msgctxt "shortcut window"
+msgid "Copy selection to clipboard"
+msgstr "Копировать выделенное в буфер обмена"
+
+#: ui/gtk/help-overlay.ui:258
+msgctxt "shortcut window"
+msgid "Paste from the clipboard"
+msgstr "Вставить из буфера обмена"
+
+#: ui/gtk/help-overlay.ui:265
+msgctxt "shortcut window"
+msgid "Quote text"
+msgstr "Цитировать текст"
+
+#: ui/gtk/help-overlay.ui:272
+msgctxt "shortcut window"
+msgid "Unquote text"
+msgstr "Убрать цитирование текста"
+
+#: ui/gtk/help-overlay.ui:281
+#| msgctxt "shortcut window"
+#| msgid "Rich text mode"
+msgctxt "shortcut window"
+msgid "Rich text editing"
+msgstr "Редактирование форматированного текста"
+
+#: ui/gtk/help-overlay.ui:285
+#| msgctxt "Clipboard paste as plain text"
+#| msgid "Paste _Without Formatting"
+msgctxt "shortcut window"
+msgid "Paste without formatting"
+msgstr "Вставить без форматирования"
+
+#: ui/gtk/help-overlay.ui:292
+msgctxt "shortcut window"
+msgid "Bold text"
+msgstr "Полужирный текст"
+
+#: ui/gtk/help-overlay.ui:299
+msgctxt "shortcut window"
+msgid "Italicize text"
+msgstr "Выделить текст курсивом"
+
+#: ui/gtk/help-overlay.ui:306
+msgctxt "shortcut window"
+msgid "Underline text"
+msgstr "Подчеркнутый текст"
+
+#: ui/gtk/help-overlay.ui:313
+msgctxt "shortcut window"
+msgid "Strike text"
+msgstr "Зачеркнутый текст"
+
+#: ui/gtk/help-overlay.ui:320
+msgctxt "shortcut window"
+msgid "Remove formatting"
+msgstr "Убрать форматирование"
+
+#: ui/gtk/help-overlay.ui:327
+#| msgid "Insert an image (Ctrl+G)"
+msgctxt "shortcut window"
+msgid "Insert an image"
+msgstr "Вставить изображение"
+
+#: ui/gtk/help-overlay.ui:334
+msgctxt "shortcut window"
+msgid "Insert a link"
+msgstr "Вставить ссылку"
+
+#: ui/gtk/help-overlay.ui:346
+#| msgctxt "shortcut window"
+#| msgid "Additional Shortcuts"
+msgid "Application Shortcuts"
+msgstr "Горячие Клавиши Приложения"
+
+#: ui/gtk/help-overlay.ui:354
+msgctxt "shortcut window"
+msgid "Show help"
+msgstr "Показать справку"
+
+#: ui/gtk/help-overlay.ui:361
+msgctxt "shortcut window"
+msgid "Show keyboard shortcuts"
+msgstr "Показать комбинации клавиш"
+
+#: ui/gtk/help-overlay.ui:368
+#| msgid "Use %s to open a new composer window"
+msgctxt "shortcut window"
+msgid "Open a new window"
+msgstr "Открыть новое окно"
+
+#: ui/gtk/help-overlay.ui:375
+#| msgctxt "shortcut window"
+#| msgid "Close composer window"
+msgctxt "shortcut window"
+msgid "Close the current window"
+msgstr "Закрыть текущее окно"
+
+#: ui/gtk/help-overlay.ui:382
+msgctxt "shortcut window"
+msgid "Quit the application"
+msgstr "Закрыть приложение"
+
+#: ui/gtk/help-overlay.ui:391
+msgctxt "shortcut window"
+msgid "Keyboard navigation"
+msgstr "Навигация с помощью клавиатуры"
+
+#: ui/gtk/help-overlay.ui:395
+#| msgid "Select Color"
+msgctxt "shortcut window"
+msgid "Select Inbox"
+msgstr "Выбрать Входящие"
+
+#: ui/gtk/help-overlay.ui:402
+#| msgctxt "shortcut window"
+#| msgid "Move focus to the next/previous pane"
+msgctxt "shortcut window"
+msgid "Go to next/previous pane"
+msgstr "Перейти к следующей/предыдущей панели"
+
+#: ui/gtk/help-overlay.ui:410
+#| msgctxt "shortcut window"
+#| msgid "Find next/previous in current conversation"
+msgctxt "shortcut window"
+msgid "Select next/previous conversation"
+msgstr "Выбрать следующую/предыдущую беседу"
+
+#: ui/gtk/help-overlay.ui:417
+#| msgctxt "shortcut window"
+#| msgid "Move focus to the next/previous pane"
+msgctxt "shortcut window"
+msgid "Focus next/previous message"
+msgstr "Фокусироваться на следующем/предыдущем сообщении"
+
+#: ui/gtk/help-overlay.ui:429
+#| msgctxt "shortcut window"
+#| msgid "Additional Shortcuts"
+msgid "Single-key Shortcuts"
+msgstr "Одноклавишные Горячие Клавиши"
+
+#: ui/gtk/help-overlay.ui:434
+msgctxt "shortcut window"
+msgid "Single-key shortcuts (if enabled)"
+msgstr "Одноклавишные Горячие Клавиши (если включено)"
+
+#: ui/gtk/help-overlay.ui:443
+msgctxt "shortcut window"
+msgid "Reply to sender "
+msgstr "Ответить отправителю "
+
+#: ui/gtk/help-overlay.ui:530
+#| msgctxt "shortcut window"
+#| msgid "Find next/previous in current conversation"
+msgctxt "shortcut window"
+msgid "Select next/previous conversations"
+msgstr "Выбрать следующие/предыдущие беседы"
+
+#: ui/password-dialog.glade:66
+msgid "SMTP Credentials"
+msgstr "Учетные данные SMTP"
+
+#: ui/password-dialog.glade:82
+msgid "Username"
+msgstr "Имя пользователя"
+
+#: ui/password-dialog.glade:140
+msgid "_Remember password"
+msgstr "_Запомнить пароль"
+
+#: ui/password-dialog.glade:195
+msgid "_Authenticate"
+msgstr "_Авторизоваться"
 
-#. Translators: Menu item to move a single, specific message
-#. to the trash
-#: ui/conversation-email-menus.ui:50
-msgid "_Trash"
-msgstr "_В корзину"
+#~ msgid "mail-send"
+#~ msgstr "mail-send"
 
-#. Translators: Menu item to delete a single, specific message
-#: ui/conversation-email-menus.ui:57
-msgid "_Delete…"
-msgstr "_Удалить…"
+#~ msgid "org.gnome.Geary"
+#~ msgstr "org.gnome.Geary"
 
-#. Translators: Menu item to view the source for a message
-#: ui/conversation-email-menus.ui:69
-msgid "_View Source"
-msgstr "_Показать исходник"
+#~ msgid "Default attachments directory"
+#~ msgstr "Каталог по умолчанию для вложений"
 
-#: ui/conversation-email-menus.ui:87
-msgid "_Save All"
-msgstr "_Сохранить все"
+#~ msgid "Location used when opening and saving attachments."
+#~ msgstr "Расположение используемое при открытии и сохранении вложений."
 
-#: ui/conversation-message-menus.ui:7
-msgid "_Open Link"
-msgstr "_Открыть ссылку"
+#~ msgid "Default print output directory"
+#~ msgstr "Каталог по умолчанию для вывода печати"
 
-#: ui/conversation-message-menus.ui:11
-msgid "Copy Link _Address"
-msgstr "_Копировать адрес ссылки"
+#~ msgid "Location used when printing to a file."
+#~ msgstr "Расположение используемое при печати в файл."
 
-#: ui/conversation-message-menus.ui:17
-msgid "Send New _Message…"
-msgstr "Отправить новое _сообщение…"
+#~ msgid "Enable notification sounds"
+#~ msgstr "Включить звуковые уведомления"
 
-#: ui/conversation-message-menus.ui:21
-msgid "Copy Email _Address"
-msgstr "Копировать эл. _адрес"
+#~ msgid "Additional addresses for %s"
+#~ msgstr "Дополнительные адреса для %s"
 
-#: ui/conversation-message-menus.ui:27
-msgid "Save _Image As…"
-msgstr "_Сохранить изображение как…"
+#~ msgid "First Last"
+#~ msgstr "Имя Фамилия"
 
-#: ui/conversation-message-menus.ui:33
-msgid "_Select All"
-msgstr "Выбрать _все"
+#~ msgid "Enter your account information to get started."
+#~ msgstr "Чтобы приступить к работе, введите информацию об учётной записи."
 
-#: ui/conversation-message-menus.ui:43
-msgid "Search for messages from"
-msgstr "Поиск сообщений от"
+#~ msgid "Preview"
+#~ msgstr "Предварительный просмотр"
 
-#: ui/conversation-message.ui:64
-msgid "From <email>"
-msgstr "От <email>"
+#~ msgid "Remem_ber passwords"
+#~ msgstr "Зап_омнить пароли"
 
-#: ui/conversation-message.ui:80 ui/conversation-message.ui:179
-msgid "1/1/1970\t"
-msgstr "1/1/1970\t"
+#~ msgid "Remem_ber password"
+#~ msgstr "За_помнить пароль"
 
-#: ui/conversation-message.ui:103
-msgid "Preview body text."
-msgstr "Предварительный просмотр основного текста."
+#~ msgid "Unable to validate:\n"
+#~ msgstr "Не удалось подтвердить:\n"
 
-#: ui/conversation-message.ui:203
-msgid "Sent by:"
-msgstr "Отправлено:"
+#~ msgid "        • Invalid account nickname.\n"
+#~ msgstr "        • Неверный псевдоним учётной записи.\n"
 
-#: ui/conversation-message.ui:248
-msgid "Reply to:"
-msgstr "Ответить:"
+#~ msgid "        • Email address already added to Geary.\n"
+#~ msgstr "        • Адрес электронной почты уже добавлен в Geary.\n"
 
-#: ui/conversation-message.ui:292
-msgid "Subject"
-msgstr "Тема"
+#~ msgid "        • IMAP connection error.\n"
+#~ msgstr "        • Ошибка подключения к IMAP.\n"
 
-#: ui/conversation-message.ui:313
-msgid "To:"
-msgstr "Кому:"
+#~ msgid "        • IMAP username or password incorrect.\n"
+#~ msgstr "        • Неверные имя пользователя или пароль IMAP.\n"
 
-#: ui/conversation-message.ui:358
-msgid "Cc:"
-msgstr "Копия:"
+#~ msgid "        • SMTP connection error.\n"
+#~ msgstr "        • Ошибка подключения к SMTP.\n"
 
-#: ui/conversation-message.ui:403
-msgid "Bcc:"
-msgstr "Скрытая копия:"
+#~ msgid "        • SMTP username or password incorrect.\n"
+#~ msgstr "        • Неверные имя пользователя или пароль SMTP.\n"
 
-#: ui/conversation-message.ui:502
-msgid "Show Images"
-msgstr "Показать изображения"
+#~ msgid "        • Connection error.\n"
+#~ msgstr "        • Ошибка подключения.\n"
 
-#: ui/conversation-message.ui:515
-msgid "Always Show From Sender"
-msgstr "Всегда показывать изображения от отправителя"
+#~ msgid "        • Username or password incorrect.\n"
+#~ msgstr "        • Неверные имя пользователя или пароль.\n"
 
-#: ui/conversation-message.ui:543
-msgid "Remote images not shown"
-msgstr "Удалённые изображения не показаны"
+#~ msgid "Output debugging information"
+#~ msgstr "Выводить отладочную информацию"
 
-#: ui/conversation-message.ui:560
-msgid "Only show remote images from senders you trust."
-msgstr "Отображать удалённые изображения только от доверенных отправителей."
+#~ msgid "Log network serialization"
+#~ msgstr "Записывать сериализацию сети"
 
-#: ui/conversation-message.ui:692
-msgid "But actually goes to:"
-msgstr "Но на самом деле ведёт на:"
+#~ msgid "Log periodic activity"
+#~ msgstr "Записывать периодическую активность"
 
-#: ui/conversation-message.ui:723
-msgid "The link appears to go to:"
-msgstr "Кажется что эта ссылка ведёт на:"
+#~ msgid "Allow inspection of WebView"
+#~ msgstr "Разрешить проверку WebView"
 
-#: ui/conversation-message.ui:735
-msgid "Deceptive link found"
-msgstr "Найдена ссылка с перенаправлением"
+#~ msgid "Please report comments, suggestions and bugs to:"
+#~ msgstr "Комментарии, пожелания и найденные ошибки отправляйте:"
 
-#: ui/conversation-message.ui:750
-msgid "The email sender may be leading you to the wrong web site."
-msgstr "Отправитель письма возможно ведёт вас на ложный веб-сайт."
+#~ msgid "Failed to parse command line options: %s\n"
+#~ msgstr "Не удалось разобрать параметры командной строки: %s\n"
 
-#: ui/conversation-message.ui:763
-msgid "If unsure, contact the sender and ask before continuing."
-msgstr ""
-"Если вы не уверены, обратитесь к отправителю и спросите, прежде чем "
-"продолжить."
+#~ msgid "Unable to store server trust exception"
+#~ msgstr "Не удалось добавить исключение безопасности сервера"
 
-#: ui/conversation-viewer.ui:60
-msgid "Find in conversation"
-msgstr "Найти в беседе"
+#~ msgid "Your settings are insecure"
+#~ msgstr "Параметры небезопасны"
 
-#: ui/conversation-viewer.ui:74
-msgid "Find the previous occurrence of the search string."
-msgstr "Найти предыдущее совпадение строки поиска."
+#~ msgid ""
+#~ "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means "
+#~ "your username and password could be read by another person on the "
+#~ "network.  Are you sure you want to do this?"
+#~ msgstr ""
+#~ "В параметрах IMAP или SMTP не указано SSL или TLS шифрование. Это "
+#~ "означает, что ваши имя пользователя и пароль могут быть перехвачены "
+#~ "сторонними лицами. Уверены, что хотите продолжить?"
 
-#: ui/conversation-viewer.ui:95
-msgid "Find the next occurrence of the search string."
-msgstr "Найти следующее совпадение строки поиска."
+#~ msgid "Co_ntinue"
+#~ msgstr "_Продолжить"
 
-#: ui/edit_alternate_emails.glade:112
-msgid "Remove email address"
-msgstr "Удалить адрес эл. почты"
+#~ msgid ""
+#~ "Geary encountered an error sending an email.  If the problem persists, "
+#~ "please manually delete the email from your Outbox folder."
+#~ msgstr ""
+#~ "В Geary произошла ошибка при отправке электронной почты. Если проблема не "
+#~ "устраняется, вручную удалите почту из папки «Исходящие»."
 
-#: ui/edit_alternate_emails.glade:136
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"Некоторые почтовые сервисы требуют дополнительные адреса, настроенные на "
-"сервере. Обратитесь к поставщику услуг электронной почты для получения "
-"дополнительной информации."
+#~ msgid ""
+#~ "Geary encountered an error saving a sent message to Sent Mail.  The "
+#~ "message will stay in your Outbox folder until you delete it."
+#~ msgstr ""
+#~ "В Geary произошла ошибка при сохранении отправленного сообщения в папку "
+#~ "«Отправленные». Сообщение будет в папке «Исходящие» пока вы не удалите "
+#~ "его."
 
-#: ui/edit_alternate_emails.glade:175
-msgid "_Update"
-msgstr "_Обновить"
+#~ msgid "Unable to open local mailbox for %s"
+#~ msgstr "Не удалось открыть локальный почтовый ящик для %s"
 
-#: ui/find_bar.glade:66
-msgid "Find:"
-msgstr "Найти:"
+#~ msgid ""
+#~ "There was an error opening the local mail database for this account. This "
+#~ "is possibly due to a file permissions problem.\n"
+#~ "\n"
+#~ "Please check that you have read/write permissions for all files in this "
+#~ "directory:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Произошла ошибка при открытии локальной базы данных почты для этой "
+#~ "учётной записи. Возможно, это произошло из-за проблем с правами доступа к "
+#~ "файлу.\n"
+#~ "\n"
+#~ "Проверьте наличие прав чтение/запись для всех файлов в данном каталоге:\n"
+#~ "\n"
+#~ "%s"
 
-#: ui/find_bar.glade:89
-msgid "_Previous"
-msgstr "_Предыдущее"
+#~ msgid ""
+#~ "The version number of the local mail database is formatted for a newer "
+#~ "version of Geary. Unfortunately, the database cannot be “rolled back” to "
+#~ "work with this version of Geary.\n"
+#~ "\n"
+#~ "Please install the latest version of Geary and try again."
+#~ msgstr ""
+#~ "Версия локальной базы данных почты имеет формат более новой версии Geary. "
+#~ "К сожалению, невозможно произвести изменение базы данных для работы с "
+#~ "этой версией Geary.\n"
+#~ "\n"
+#~ "Установите последнюю версию Geary и попробуйте снова."
 
-#: ui/find_bar.glade:107
-msgid "_Next"
-msgstr "_Следующее"
+#~ msgid ""
+#~ "There was an error opening the local account. This is probably due to "
+#~ "connectivity issues.\n"
+#~ "\n"
+#~ "Please check your network connection and restart Geary."
+#~ msgstr ""
+#~ "Произошла ошибка при открытии локальной учётной записи. Возможно, это "
+#~ "произошло из-за проблем с подключением.\n"
+#~ "\n"
+#~ "Проверьте подключение к сети и перезапустите Geary."
 
-#: ui/find_bar.glade:125
-msgid "_Case sensitive"
-msgstr "_Учитывать регистр"
+#~ msgid "Undo move (Ctrl+Z)"
+#~ msgstr "Отменить перемещение (Ctrl+Z)"
 
-#: ui/find_bar.glade:145
-msgid "label"
-msgstr "метка"
+#~ msgid "Close the draft message?"
+#~ msgid_plural "Close all draft messages?"
+#~ msgstr[0] "Закрыть черновик?"
+#~ msgstr[1] "Закрыть черновики?"
+#~ msgstr[2] "Закрыть черновики?"
 
-#: ui/gtk/help-overlay.ui:9
-msgid "Conversation Shortcuts"
-msgstr "Комбинации бесед"
+#~ msgid "Error emptying %s"
+#~ msgstr "Ошибка очистки %s"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:254
-msgctxt "shortcut window"
-msgid "General"
-msgstr "Основное"
+#~ msgid "Undo trash (Ctrl+Z)"
+#~ msgstr "Отменить перемещение в корзину (Ctrl+Z)"
 
-#: ui/gtk/help-overlay.ui:17
-msgctxt "shortcut window"
-msgid "Move focus to the next/previous pane"
-msgstr "Переместить фокус на следующую/предыдущую панель"
+#~ msgid "Undo archive (Ctrl+Z)"
+#~ msgstr "Отменить архивирование (Ctrl+Z)"
 
-#: ui/gtk/help-overlay.ui:24
-msgctxt "shortcut window"
-msgid "Move focus to conversation list"
-msgstr "Переместить фокус в список бесед"
+#~ msgid "Undo (Ctrl+Z)"
+#~ msgstr "Отменить (Ctrl+Z)"
 
-#: ui/gtk/help-overlay.ui:31
-msgctxt "shortcut window"
-msgid "Detach composer window"
-msgstr "Отсоединить окно редактора"
+#~ msgid "Successfully sent mail to %s."
+#~ msgstr "Письмо успешно отправлено %s."
 
-#: ui/gtk/help-overlay.ui:38
-msgctxt "shortcut window"
-msgid "Close composer window"
-msgstr "Закрыть окно редактора"
+#~ msgid "Failed to open default text editor."
+#~ msgstr "Не удалось запустить текстовый редактор по-умолчанию."
 
-#: ui/gtk/help-overlay.ui:45
-msgctxt "shortcut window"
-msgid "Show keyboard shortcuts"
-msgstr "Показать комбинации клавиш"
+#~ msgid "Delete conversation (Shift+Delete)"
+#~ msgstr "Удалить беседу (Shift+Delete)"
 
-#: ui/gtk/help-overlay.ui:52
-msgctxt "shortcut window"
-msgid "Show help"
-msgstr "Показать справку"
+#~ msgid "Delete conversations (Shift+Delete)"
+#~ msgstr "Удалить беседы (Shift+Delete)"
 
-#: ui/gtk/help-overlay.ui:59
-msgctxt "shortcut window"
-msgid "Quit the application"
-msgstr "Завершить приложение"
+#~ msgid "Move conversation to Trash (Delete, Backspace)"
+#~ msgstr "Переместить беседу в корзину (Delete, Backspace)"
 
-#: ui/gtk/help-overlay.ui:68
-msgctxt "shortcut window"
-msgid "Search"
-msgstr "Поиск"
+#~ msgid "Move conversations to Trash (Delete, Backspace)"
+#~ msgstr "Переместить беседы в корзину (Delete, Backspace)"
 
-#: ui/gtk/help-overlay.ui:72
-msgctxt "shortcut window"
-msgid "Jump to search box"
-msgstr "Перейти в строку поиска"
+#~ msgid "Add label to conversations"
+#~ msgstr "Добавить метку беседам"
 
-#: ui/gtk/help-overlay.ui:79
-msgctxt "shortcut window"
-msgid "Find in current conversation"
-msgstr "Найти в текущей беседе"
+#~| msgid "Error connecting to the server"
+#~ msgid "Problem connecting to incoming server for %s"
+#~ msgstr "Проблема подключения к серверу входящих для %s"
 
-#: ui/gtk/help-overlay.ui:86
-msgctxt "shortcut window"
-msgid "Find next/previous in current conversation"
-msgstr "Найти следующее/предыдущее в текущей беседе"
+#~ msgid ""
+#~ "Could not connect to %s, check your Internet access and the server name "
+#~ "and try again"
+#~ msgstr ""
+#~ "Не удалось подключиться к %s, проверьте доступ к Интернету и имя сервера, "
+#~ "затем повторить попытку"
 
-#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:274
-msgctxt "shortcut window"
-msgid "Actions"
-msgstr "Действия"
+#~ msgid "Retry connecting now"
+#~ msgstr "Повторить подключение сейчас"
 
-#: ui/gtk/help-overlay.ui:99
-msgctxt "shortcut window"
-msgid "Compose a new message"
-msgstr "Написать новое сообщение"
+#~| msgid "Error connecting to the server"
+#~ msgid "Problem connecting to outgoing server for %s"
+#~ msgstr "Проблема подключения к серверу исходящих для %s"
 
-#: ui/gtk/help-overlay.ui:106
-msgctxt "shortcut window"
-msgid "Reply to sender "
-msgstr "Ответить отправителю "
+#~ msgid "Try reconnecting now"
+#~ msgstr "Попробовать переподключиться сейчас"
 
-#: ui/gtk/help-overlay.ui:113
-msgctxt "shortcut window"
-msgid "Reply to all"
-msgstr "Ответить всем"
+#~ msgid "Problem with connection to incoming server for %s"
+#~ msgstr "Проблема с подключением к серверу входящих для %s"
 
-#: ui/gtk/help-overlay.ui:120
-msgctxt "shortcut window"
-msgid "Forward"
-msgstr "Вперёд"
+#~ msgid ""
+#~ "Network error talking to %s, check your Internet access and try again"
+#~ msgstr ""
+#~ "Ошибка сети, связанная с %s, проверьте доступ к Интернету и повторите "
+#~ "попытку"
 
-#: ui/gtk/help-overlay.ui:127
-msgctxt "shortcut window"
-msgid "Archive"
-msgstr "Архив"
+#~| msgid "Error connecting to the server"
+#~ msgid "Problem with connection to outgoing server for %s"
+#~ msgstr "Проблема с подключением к серверу исходящих для %s"
 
-#: ui/gtk/help-overlay.ui:134
-msgctxt "shortcut window"
-msgid "Move to trash"
-msgstr "Переместить в корзину"
+#~ msgid "Problem communicating with incoming server for %s"
+#~ msgstr "Проблема связи с сервером входящих для %s"
 
-#: ui/gtk/help-overlay.ui:141
-msgctxt "shortcut window"
-msgid "Toggle spam"
-msgstr "Переключить метку спам/не спам"
+#~ msgid ""
+#~ "Geary did not understand a message from %s or vice versa, please file a "
+#~ "bug report"
+#~ msgstr ""
+#~ "Geary не понял сообщения от %s или наоборот, напишите отчёт об ошибке"
 
-#: ui/gtk/help-overlay.ui:148
-msgctxt "shortcut window"
-msgid "Move the conversation"
-msgstr "Переместить беседу"
+#~ msgid "Problem communicating with outgoing mail server"
+#~ msgstr "Проблема связи с сервером исходящих для %s"
 
-#: ui/gtk/help-overlay.ui:155
-msgctxt "shortcut window"
-msgid "Label the conversation"
-msgstr "Добавить метку беседе"
+#~ msgid ""
+#~ "Could not communicate with %s for %s, check the server name and try again "
+#~ "in a moment"
+#~ msgstr ""
+#~ "Не удалось связаться с %s для %s, проверьте имя сервера и повторите "
+#~ "попытку"
 
-#: ui/gtk/help-overlay.ui:163
-msgctxt "shortcut window"
-msgid "Mark read"
-msgstr "Отметить как прочитанное"
+#~ msgid "Incoming mail server password required for %s"
+#~ msgstr "Требуется пароль сервера входящих для %s"
 
-#: ui/gtk/help-overlay.ui:170
-msgctxt "shortcut window"
-msgid "Mark unread"
-msgstr "Отметить как непрочитанное"
+#~ msgid "Messages cannot be received without the correct password."
+#~ msgstr "Невозможно получить сообщения без правильного пароля."
 
-#: ui/gtk/help-overlay.ui:179
-msgctxt "shortcut window"
-msgid "View"
-msgstr "Вид"
+#~ msgid "Outgoing mail server password required for %s"
+#~ msgstr "Требуется пароль сервера исходящих для %s"
 
-#: ui/gtk/help-overlay.ui:183
-msgctxt "shortcut window"
-msgid "Zoom in"
-msgstr "Приблизить"
+#~ msgid "Messages cannot be sent without the correct password."
+#~ msgstr "Невозможно отправить сообщения без правильного пароля."
 
-#: ui/gtk/help-overlay.ui:190
-msgctxt "shortcut window"
-msgid "Zoom out"
-msgstr "Отдалить"
+#~ msgid ""
+#~ "Copy technical details to clipboard for pasting into an email or bug "
+#~ "report"
+#~ msgstr ""
+#~ "Скопируйте технические данные в буфер обмена для вставки в сообщение "
+#~ "электронной почты или в сообщение об ошибке"
 
-#: ui/gtk/help-overlay.ui:197
-msgctxt "shortcut window"
-msgid "Reset zoom"
-msgstr "Сбросить масштаб"
+#~ msgid "Indexing %s account"
+#~ msgstr "Индексируется учётная запись %s"
 
-#: ui/gtk/help-overlay.ui:206
-msgctxt "shortcut window"
-msgid "Additional Shortcuts"
-msgstr "Дополнительные комбинации"
+#~ msgid "To: "
+#~ msgstr "Кому: "
 
-#: ui/gtk/help-overlay.ui:210
-msgctxt "shortcut window"
-msgid "Star"
-msgstr "Добавить в избранное"
+#~ msgid "Cc: "
+#~ msgstr "Копия: "
 
-#: ui/gtk/help-overlay.ui:217
-msgctxt "shortcut window"
-msgid "Unstar"
-msgstr "Убрать из избранных"
+#~ msgid "Bcc: "
+#~ msgstr "Скрытая копия: "
 
-#: ui/gtk/help-overlay.ui:224
-msgctxt "shortcut window"
-msgid "Delete"
-msgstr "Удалить"
+#~ msgid "Geary will exit if you have no other open email accounts."
+#~ msgstr "Geary завершит работу если нет других открытых учётных записей."
 
-#: ui/gtk/help-overlay.ui:231
-msgctxt "shortcut window"
-msgid "Jump to next (older) conversation"
-msgstr "Перейти к следующей (ранней) беседе"
+#~ msgid "Open"
+#~ msgstr "Открыть"
 
-#: ui/gtk/help-overlay.ui:238
-msgctxt "shortcut window"
-msgid "Jump to previous (newer) conversation"
-msgstr "Перейти к предыдущей (поздней) беседе"
+#~ msgctxt "Default clock format"
+#~ msgid "%l:%M %P"
+#~ msgstr "%H:%M"
 
-#: ui/gtk/help-overlay.ui:250
-msgid "Composer Shortcuts"
-msgstr "Комбинации редактора"
+#~ msgid "%x"
+#~ msgstr "%x"
 
-#: ui/gtk/help-overlay.ui:258
-msgctxt "shortcut window"
-msgid "Quote text"
-msgstr "Цитировать текст"
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
 
-#: ui/gtk/help-overlay.ui:265
-msgctxt "shortcut window"
-msgid "Unquote text"
-msgstr "Убрать цитирование текста"
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
 
-#: ui/gtk/help-overlay.ui:278
-msgctxt "shortcut window"
-msgid "Send"
-msgstr "Отправить"
+#~ msgid "Other"
+#~ msgstr "Другой"
 
-#: ui/gtk/help-overlay.ui:285
-msgctxt "shortcut window"
-msgid "Add attachment"
-msgstr "Добавить вложение"
+#~ msgid "Sent Mail"
+#~ msgstr "Отправленные"
 
-#: ui/gtk/help-overlay.ui:294
-msgctxt "shortcut window"
-msgid "Rich text mode"
-msgstr "Режим форматированного текста"
+#~ msgid "Spam"
+#~ msgstr "Спам"
 
-#: ui/gtk/help-overlay.ui:298
-msgctxt "shortcut window"
-msgid "Bold text"
-msgstr "Жирный текст"
+#~ msgid "From: %s\n"
+#~ msgstr "От: %s\n"
 
-#: ui/gtk/help-overlay.ui:305
-msgctxt "shortcut window"
-msgid "Italicize text"
-msgstr "Курсивный текст"
+#~ msgid "Subject: %s\n"
+#~ msgstr "Тема: %s\n"
 
-#: ui/gtk/help-overlay.ui:312
-msgctxt "shortcut window"
-msgid "Underline text"
-msgstr "Подчёркнутый текст"
+#~ msgid "Date: %s\n"
+#~ msgstr "Дата: %s\n"
 
-#: ui/gtk/help-overlay.ui:319
-msgctxt "shortcut window"
-msgid "Strike text"
-msgstr "Зачёркнутый текст"
+#~ msgid "To: %s\n"
+#~ msgstr "Кому: %s\n"
 
-#: ui/gtk/help-overlay.ui:326
-msgctxt "shortcut window"
-msgid "Insert a link"
-msgstr "Вставить ссылку"
+#~ msgid "Cc: %s\n"
+#~ msgstr "Копия: %s\n"
 
-#: ui/gtk/help-overlay.ui:333
-msgctxt "shortcut window"
-msgid "Remove formatting"
-msgstr "Убрать форматирование"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Невозможно удалить учётную запись</"
+#~ "span> "
 
-#: ui/gtk/menus.ui:13
-msgid "A_ccounts"
-msgstr "_Учётные записи"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Открыто окно редактирования писем, связанное с данной учётной записью. "
+#~ "Отправьте письмо или отмените его, затем попробуйте снова."
 
-#: ui/gtk/menus.ui:23
-msgid "_Keyboard Shortcuts"
-msgstr "_Комбинации клавиш"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Подождите пока Geary проверит учётную запись."
 
-#: ui/login.glade:88
-msgid "email example com"
-msgstr "email example com"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Открепить (Ctrl+D)"
 
-#: ui/login.glade:107 ui/password-dialog.glade:108
-msgid "Password"
-msgstr "Пароль"
+#~ msgid "Attach File (Ctrl+T)"
+#~ msgstr "Вложить файл (Ctrl+T)"
 
-#: ui/login.glade:123
-msgid "E_mail address"
-msgstr "Адрес _эл. почты"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Отправить (Ctrl+Enter)"
 
-#: ui/login.glade:144 ui/login.glade:635
-msgid "_Password"
-msgstr "_Пароль"
+#~ msgid "Open this link"
+#~ msgstr "Открыть эту ссылку"
 
-#: ui/login.glade:178
-msgid "S_ervice"
-msgstr "_Сервис"
+#~ msgid "C_olor"
+#~ msgstr "_Цвет"
 
-#: ui/login.glade:199
-msgid "N_ame"
-msgstr "_Имя"
+#~ msgid "Show Extended Fields"
+#~ msgstr "Показывать дополнительные поля"
 
-#: ui/login.glade:256
-msgid "N_ickname"
-msgstr "_Псевдоним"
+#~ msgid "_Reply-To"
+#~ msgstr "_Ответить"
 
-#: ui/login.glade:280
-msgid "Work, Home, etc."
-msgstr "Рабочий, Домашний, и т.д."
+#~ msgid "From"
+#~ msgstr "От"
 
-#: ui/login.glade:291
-msgid "_Save sent mail"
-msgstr "_Сохранять отправленные"
+#~ msgid "Redo last edit  (Ctrl+Shift+Z)"
+#~ msgstr "Вернуть последние изменения (Ctrl+Shift+Z)"
 
-#: ui/login.glade:309
-msgid "Addi_tional email addresses…"
-msgstr "_Дополнительные адреса эл. почты…"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Жирный (Ctrl+B)"
 
-#: ui/login.glade:353
-msgid "IMAP settings"
-msgstr "Параметры IMAP"
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Курсив (Ctrl+I)"
 
-#: ui/login.glade:372
-msgid "Se_rver"
-msgstr "Се_рвер"
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Подчёркнутый (Ctrl+U)"
 
-#: ui/login.glade:393
-msgid "imap.example.com"
-msgstr "imap.example.com"
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Зачёркнутый (Ctrl+K)"
 
-#: ui/login.glade:409
-msgid "P_ort"
-msgstr "П_орт"
+#~ msgid "Insert ordered list"
+#~ msgstr "Вставить упорядоченный список"
 
-#: ui/login.glade:448
-msgid "smtp.example.com"
-msgstr "smtp.example.com"
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Цитировать текст (Ctrl+])"
 
-#: ui/login.glade:480
-msgid "Ser_ver"
-msgstr "Сер_вер"
+#~ msgid "Unquote text  (Ctrl+[)"
+#~ msgstr "Убрать цитирование текста (Ctrl+[)"
 
-#: ui/login.glade:501
-msgid "Por_t"
-msgstr "По_рт"
+#~ msgid "Remove selection formatting (Ctrl+Space)"
+#~ msgstr "Убрать форматирование выбранного (Ctrl+Space)"
 
-#: ui/login.glade:522
-msgid "SMTP settings"
-msgstr "Параметры SMTP"
+#~ msgid "Display the message menu"
+#~ msgstr "Показать меню сообщений"
 
-#: ui/login.glade:541
-msgid "User_name"
-msgstr "Имя _пользователя"
+#~ msgid "Edit Draft"
+#~ msgstr "Редактировать черновик"
 
-#: ui/login.glade:562
-msgid "Pass_word"
-msgstr "Пар_оль"
+#~ msgid "_Trash"
+#~ msgstr "_В корзину"
 
-#: ui/login.glade:582
-msgid "SMTP username"
-msgstr "Имя пользователя SMTP"
+#~ msgid "Send New _Message…"
+#~ msgstr "Отправить новое _сообщение…"
 
-#: ui/login.glade:598
-msgid "SMTP password"
-msgstr "Пароль SMTP"
+#~ msgid "Search for messages from"
+#~ msgstr "Поиск сообщений от"
 
-#: ui/login.glade:614
-msgid "_Username"
-msgstr "_Имя пользователя"
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "Некоторые почтовые сервисы требуют дополнительные адреса, настроенные на "
+#~ "сервере. Обратитесь к поставщику услуг электронной почты для получения "
+#~ "дополнительной информации."
 
-#: ui/login.glade:655
-msgid "IMAP username"
-msgstr "Имя пользователя IMAP"
+#~ msgctxt "shortcut window"
+#~ msgid "Move focus to conversation list"
+#~ msgstr "Переместить фокус в список бесед"
 
-#: ui/login.glade:671
-msgid "IMAP password"
-msgstr "Пароль IMAP"
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to search box"
+#~ msgstr "Перейти в строку поиска"
 
-#: ui/login.glade:688
-msgid "Encr_yption"
-msgstr "Ши_фрование"
+#~ msgctxt "shortcut window"
+#~ msgid "Compose a new message"
+#~ msgstr "Написать новое сообщение"
 
-#: ui/login.glade:711
-msgid "Encrypt_ion"
-msgstr "Шиф_рование"
+#~ msgctxt "shortcut window"
+#~ msgid "Archive"
+#~ msgstr "Архив"
 
-#: ui/login.glade:733 ui/login.glade:751
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgctxt "shortcut window"
+#~ msgid "Move the conversation"
+#~ msgstr "Переместить беседу"
 
-#: ui/login.glade:734 ui/login.glade:752
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgctxt "shortcut window"
+#~ msgid "Mark unread"
+#~ msgstr "Отметить как непрочитанное"
 
-#: ui/login.glade:764
-msgid "No authentication re_quired"
-msgstr "Аутентификация не требуется"
+#~ msgctxt "shortcut window"
+#~ msgid "Unstar"
+#~ msgstr "Убрать из избранных"
 
-#: ui/login.glade:781
-msgid "Use IMAP cre_dentials"
-msgstr "Использовать _учётные данные IMAP"
+#~ msgctxt "shortcut window"
+#~ msgid "Delete"
+#~ msgstr "Удалить"
 
-#: ui/login.glade:888
-msgid "Composer"
-msgstr "Редактирование"
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to next (older) conversation"
+#~ msgstr "Перейти к следующей (ранней) беседе"
 
-#: ui/login.glade:901
-msgid "Save dra_fts on server"
-msgstr "Сохранять черновики на сервере"
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to previous (newer) conversation"
+#~ msgstr "Перейти к предыдущей (поздней) беседе"
 
-#: ui/login.glade:918
-msgid "Si_gn emails (HTML allowed):"
-msgstr "Подписывать письма (доступно HTML):"
+#~ msgid "A_ccounts"
+#~ msgstr "_Учётные записи"
 
-#: ui/login.glade:976
-msgid "Storage"
-msgstr "Хранилище"
+#~ msgid "E_mail address"
+#~ msgstr "Адрес _эл. почты"
 
-#: ui/login.glade:998
-msgid "_Download mail"
-msgstr "_Загружать почту"
+#~ msgid "_Password"
+#~ msgstr "_Пароль"
 
-#: ui/main-toolbar.ui:51
-msgid "Toggle search bar"
-msgstr "Включить панель поиска"
+#~ msgid "S_ervice"
+#~ msgstr "_Сервис"
 
-#: ui/main-toolbar.ui:72
-msgid "Empty Spam or Trash folders"
-msgstr "Очистить Корзину или Спам"
+#~ msgid "N_ame"
+#~ msgstr "_Имя"
 
-#: ui/main-toolbar.ui:112
-msgid "Reply"
-msgstr "Ответить"
+#~ msgid "N_ickname"
+#~ msgstr "_Псевдоним"
 
-#: ui/main-toolbar.ui:135
-msgid "Reply All"
-msgstr "Ответить всем"
+#~ msgid "Work, Home, etc."
+#~ msgstr "Рабочий, Домашний, и т.д."
 
-#: ui/main-toolbar.ui:158
-msgid "Forward"
-msgstr "Вперёд"
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "_Дополнительные адреса эл. почты…"
 
-#: ui/main-toolbar.ui:264
-msgid "Toggle find bar"
-msgstr "Переключить панель поиска"
+#~ msgid "IMAP settings"
+#~ msgstr "Параметры IMAP"
 
-#: ui/main-toolbar.ui:306
-msgid "_Archive"
-msgstr "_Архивировать"
+#~ msgid "Se_rver"
+#~ msgstr "Се_рвер"
 
-#: ui/main-toolbar-menus.ui:5
-msgid "Empty _Spam…"
-msgstr "Очистить _Спам…"
+#~ msgid "P_ort"
+#~ msgstr "П_орт"
 
-#: ui/main-toolbar-menus.ui:9
-msgid "Empty _Trash…"
-msgstr "Очистить _Корзину…"
+#~ msgid "Ser_ver"
+#~ msgstr "Сер_вер"
 
-#: ui/main-toolbar-menus.ui:32
-msgid "Mark as S_pam"
-msgstr "Отметить как С_пам"
+#~ msgid "Por_t"
+#~ msgstr "По_рт"
 
-#: ui/main-toolbar-menus.ui:36
-msgid "Mark as not S_pam"
-msgstr "Отметить как _не Спам"
+#~ msgid "User_name"
+#~ msgstr "Имя _пользователя"
 
-#: ui/main-window-info-bar.ui:97
-msgid ""
-"If the problem is serious or persists, please copy and send these details to "
-"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing list</a> "
-"or file a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\";>new "
-"bug report</a>."
-msgstr ""
-"Если проблема серьёзная или сохраняется, скопируйте и отправьте эти данные в "
-"<a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>список рассылки</a> "
-"или напишите <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug";
-"\">новый отчёт об ошибке</a>."
+#~ msgid "Pass_word"
+#~ msgstr "Пар_оль"
 
-#: ui/main-window-info-bar.ui:113
-msgid "Details:"
-msgstr "Подробности:"
+#~ msgid "SMTP password"
+#~ msgstr "Пароль SMTP"
 
-#: ui/password-dialog.glade:74
-msgid "SMTP Credentials"
-msgstr "Учётные данные SMTP"
+#~ msgid "_Username"
+#~ msgstr "_Имя пользователя"
 
-#: ui/password-dialog.glade:91
-msgid "Username"
-msgstr "Имя пользователя"
+#~ msgid "IMAP password"
+#~ msgstr "Пароль IMAP"
 
-#: ui/password-dialog.glade:152
-msgid "_Remember password"
-msgstr "_Запомнить пароль"
+#~ msgid "Encr_yption"
+#~ msgstr "Ши_фрование"
 
-#: ui/password-dialog.glade:210
-msgid "_Authenticate"
-msgstr "_Авторизоваться"
+#~ msgid "Encrypt_ion"
+#~ msgstr "Шиф_рование"
 
-#: ui/preferences-dialog.ui:38
-msgid "Reading"
-msgstr "Просмотр"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ui/preferences-dialog.ui:51
-msgid "_Automatically select next message"
-msgstr "_Автоматически переходить к следующему сообщению"
+#~ msgid "No authentication re_quired"
+#~ msgstr "Аутентификация не требуется"
 
-#: ui/preferences-dialog.ui:70
-msgid "_Display conversation preview"
-msgstr "_Показывать предварительный просмотр сообщений"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "Использовать _учётные данные IMAP"
 
-#: ui/preferences-dialog.ui:89
-msgid "Use _three pane view"
-msgstr "Использовать _трёхпанельный интерфейс"
+#~ msgid "Composer"
+#~ msgstr "Редактирование"
 
-#: ui/preferences-dialog.ui:113
-msgid "Notifications"
-msgstr "Уведомления"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "Подписывать письма (доступно HTML):"
 
-#: ui/preferences-dialog.ui:126
-msgid "_Play notification sounds"
-msgstr "_Проигрывать звуковые уведомления"
+#~ msgid "Storage"
+#~ msgstr "Хранилище"
 
-#: ui/preferences-dialog.ui:145
-msgid "Show _notifications for new mail"
-msgstr "_Показывать уведомления о новых сообщениях"
+#~ msgid "Empty Spam or Trash folders"
+#~ msgstr "Очистить Корзину или Спам"
 
-#: ui/preferences-dialog.ui:164
-msgid "_Watch for new mail when closed"
-msgstr "_Следить за поступлением новых писем при закрытом приложении"
+#~ msgid "Empty _Spam…"
+#~ msgstr "Очистить _Спам…"
 
-#: ui/preferences-dialog.ui:168
-msgid "Geary will keep running after all windows are closed"
-msgstr "Geary будет продолжать работать после закрытия всех окон"
+#~ msgid "Empty _Trash…"
+#~ msgstr "Очистить _Корзину…"
 
-#: ui/preferences-dialog.ui:195
-msgid "Preferences"
-msgstr "Параметры"
+#~ msgid "Mark as S_pam"
+#~ msgstr "Отметить как С_пам"
 
-#: ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Действительно удалить эту учётную "
-"запись?</span> "
+#~ msgid "Mark as not S_pam"
+#~ msgstr "Отметить как _не Спам"
 
-#: ui/remove_confirm.glade:58
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Все письма связанные с данной учётной записью будут удалены с компьютера. "
-"Это не повлияет на электронную почту на сервере."
+#~ msgid "Reading"
+#~ msgstr "Просмотр"
+
+#~ msgid "Use _three pane view"
+#~ msgstr "Использовать _трёхпанельный интерфейс"
 
-#: ui/remove_confirm.glade:80
-msgid "Nickname:"
-msgstr "Псевдоним:"
+#~ msgid "Notifications"
+#~ msgstr "Уведомления"
 
-#: ui/remove_confirm.glade:94
-msgid "Email address:"
-msgstr "Адрес эл. почты:"
+#~ msgid "_Play notification sounds"
+#~ msgstr "_Проигрывать звуковые уведомления"
 
-#: ui/upgrade_dialog.glade:60
-msgid "Geary update in progress…"
-msgstr "Geary выполняет обновление…"
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "_Показывать уведомления о новых сообщениях"
 
-#~ msgid "Send files using Geary"
-#~ msgstr "Отправить файлы с помощью Geary"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove "
+#~ "this account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Действительно удалить эту учётную "
+#~ "запись?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your "
+#~ "computer. This will not affect email on the server."
+#~ msgstr ""
+#~ "Все письма связанные с данной учётной записью будут удалены с компьютера. "
+#~ "Это не повлияет на электронную почту на сервере."
+
+#~ msgid "Nickname:"
+#~ msgstr "Псевдоним:"
 
 #~ msgid "Geary Email"
 #~ msgstr "Электронная почта Geary"
@@ -3149,9 +4603,6 @@ msgstr "Geary выполняет обновление…"
 #~ msgid "Try Again"
 #~ msgstr "Попробовать снова"
 
-#~ msgid "Empty"
-#~ msgstr "Очистить"
-
 #~ msgid "%i match"
 #~ msgid_plural "%i matches"
 #~ msgstr[0] "%i совпадение"
@@ -3164,18 +4615,9 @@ msgstr "Geary выполняет обновление…"
 #~ msgstr[1] "%i совпадения (от начала)"
 #~ msgstr[2] "%i совпадений (от начала)"
 
-#~ msgid "not found"
-#~ msgstr "не найдено"
-
 #~ msgid "No search results found."
 #~ msgstr "Нет результатов поиска."
 
-#~ msgid "From:"
-#~ msgstr "От:"
-
-#~ msgid "Date:"
-#~ msgstr "Дата:"
-
 #~ msgid "Copy _Link"
 #~ msgstr "Копировать _ссылку"
 
@@ -3185,9 +4627,6 @@ msgstr "Geary выполняет обновление…"
 #~ msgid " (Invalid?)"
 #~ msgstr " (Небезопасная?)"
 
-#~ msgid "_Save As..."
-#~ msgstr "_Сохранить как…"
-
 #~ msgid "Save A_ttachment..."
 #~ msgid_plural "Save All A_ttachments..."
 #~ msgstr[0] "Сохранить вложение…"
@@ -3212,9 +4651,6 @@ msgstr "Geary выполняет обновление…"
 #~ msgid "Link (Ctrl+L)"
 #~ msgstr "Ссылка (Ctrl+L)"
 
-#~ msgid "More options"
-#~ msgstr "Дополнительные параметры"
-
 #~ msgctxt "Label"
 #~ msgid "Close and Save"
 #~ msgstr "Сохранить и закрыть"
@@ -3248,18 +4684,6 @@ msgstr "Geary выполняет обновление…"
 #~ msgid "Small"
 #~ msgstr "Мелкий"
 
-#~ msgid "Sans Serif"
-#~ msgstr "Без засечек"
-
-#~ msgid "Serif"
-#~ msgstr "С засечками"
-
-#~ msgid "Fixed Width"
-#~ msgstr "Моноширинный"
-
-#~ msgid "_Attach File"
-#~ msgstr "_Вложить файл"
-
 #~ msgid "_Include Original Attachments"
 #~ msgstr "_Включить исходные вложения"