[geary] Updated Russian translation

From: Damned-Lies <translations src gnome org>
To: commits-list gnome org
Cc:
Subject: [geary] Updated Russian translation
Date: Tue, 24 Mar 2015 06:47:46 +0000 (UTC)
commit 5d4c6643d0dec5f0e904ae08b0f824a7a319c38f
Author: Stas Solovey <whats_up tut by>
Date:   Tue Mar 24 06:47:41 2015 +0000

    Updated Russian translation

 po/ru.po | 2929 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 1785 insertions(+), 1144 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index 1e5d836..e5029b4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,1527 +8,2168 @@
 # RealRedFox <redfox front ru>, 2013
 # Pentagrammer <pent spb gmail com>, 2013
 # mynameisdaniil <sobol daniil gmail com>, 2012
+# Aleksandr Stepanov <alex eri ya ru>, 2015.
+# Stas Solovey <whats_up tut by>, 2015.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
-"POT-Creation-Date: 2013-09-20 12:16-0700\n"
-"PO-Revision-Date: 2013-11-08 14:16+0000\n"
-"Last-Translator: RealRedFox <redfox front ru>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/geary/language/";
-"ru/)\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=geary&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2015-03-24 06:08+0000\n"
+"PO-Revision-Date: 2015-03-24 09:43+0300\n"
+"Last-Translator: Stas Solovey <whats_up tut by>\n"
+"Language-Team: Русский <gnome-cyr gnome org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:641
-msgid "        &#8226; Connection error.\n"
-msgstr ""
-"&#8226; Ошибка подключения.\n"
-"\n"
+#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
+msgid "Geary"
+msgstr "Geary"
 
-#: ../../src/client/accounts/add-edit-page.vala:624
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr ""
+#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr "Почтовый клиент"
 
-#: ../../src/client/accounts/add-edit-page.vala:628
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "&#8226; IMAP ошибка подключения.\n"
+#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
+msgid "Geary Mail"
+msgstr "Почтовый клиент Geary"
 
-#: ../../src/client/accounts/add-edit-page.vala:631
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "&#8226; IMAP задан неправильный пароль или логин.\n"
+#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
+msgid "Send and receive email"
+msgstr "Отправка и получение электронной почты"
 
-#: ../../src/client/accounts/add-edit-page.vala:621
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "&#8226; Некорректный псевдоним учетной записи.\n"
+#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
+msgid "Email;E-mail;Mail;"
+msgstr "Электронная;Почта;Email;E-mail;Mail;"
 
-#: ../../src/client/accounts/add-edit-page.vala:634
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "&#8226; SMTP ошибка подключения.\n"
+#: ../desktop/geary.desktop.in.h:6
+msgid "Compose Message"
+msgstr "Новое сообщение"
 
-#: ../../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "&#8226; SMTP задан неправильный пароль или логин.\n"
+#: ../desktop/geary-attach.contract.in.h:1
+msgid "Send by email"
+msgstr "Отправить по эл. почте"
 
-#: ../../src/client/accounts/add-edit-page.vala:645
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "&#8226; Задан неправильный пароль или логин.\n"
+#: ../desktop/geary-attach.contract.in.h:2
+msgid "Send files using Geary"
+msgstr "Отправить файлы с помощью Geary"
 
-#: ../../src/client/views/conversation-viewer.vala:1203
-msgid " (Invalid?)"
-msgstr ""
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Сохранить"
 
-#: ../../src/client/composer/composer-window.vala:972
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" уже вложено в письмо."
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Добавить"
 
-#: ../../src/client/composer/composer-window.vala:937
+#. reset/clear widgets
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 #, c-format
-msgid "\"%s\" could not be found."
-msgstr "\"%s\" невозможно найти."
+msgid "Additional addresses for %s"
+msgstr "Дополнительные адреса для %s"
 
-#: ../../src/client/composer/composer-window.vala:965
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "\"%s\" невозможно открыть для чтения."
+#. Sets min size.
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "Учётные записи"
+
+#. Copyright 2011-2015 Yorba Foundation
+#. *
+#. * This software is licensed under the GNU Lesser General Public License
+#. * (version 2.1 or later).  See the COPYING file in this distribution.
+#.
+#. Page for adding or editing an account.
+#. / Placeholder text indicating that the user should type their first name and last name
+#: ../src/client/accounts/add-edit-page.vala:10
+msgid "First Last"
+msgstr "Имя Фамилия"
 
-#: ../../src/client/composer/composer-window.vala:944
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" это каталог."
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr "Добро пожаловать в Geary."
 
-#: ../../src/client/composer/composer-window.vala:951
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" это пустой файл."
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr "Чтобы приступить к работе введите информацию об учётной записи."
 
-#. / Date format that shows the weekday (Monday, Tuesday, ...)
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:182
-#, c-format
-msgid "%A"
-msgstr "%A"
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr "За последние 2 недели"
 
-#. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:91
-msgid "%B %-e, %Y %-H:%M"
-msgstr "%B %-e, %Y %-H:%M"
+#. IDs are # of days
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr "За последний месяц"
 
-#. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:88
-msgid "%B %-e, %Y %-l:%M %P"
-msgstr "%B %-e, %Y %-l:%M %P"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr "За последние 3 месяца"
 
-#. / Verbose datetime format for the locale default (full month, day and time)
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:94
-msgctxt "Default full date"
-msgid "%B %-e, %Y %-l:%M %P"
-msgstr "%B %-e, %Y %-l:%M %P"
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr "За последние 6 месяцев"
 
-#. / Datetime format for 24-hour time, i.e. 16:35
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:71
-msgid "%H:%M"
-msgstr "%H:%M"
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr "За последний год"
 
-#. / Format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/engine/rfc822/rfc822-utils.vala:165
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %b %-e, %Y в %-l:%M %p"
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr "За последние 2 года"
 
-#. / Date format for dates within the current year, i.e. Nov 8
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:78
-msgid "%b %-e"
-msgstr "%b %-e"
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr "За последние 4 года"
 
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] "%d сообщение"
-msgstr[1] "%d сообщение"
-msgstr[2] "%d сообщения"
+#. Separator
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr "За всё время"
 
-#: ../../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d новое сообщение"
-msgstr[1] "%d новых сообщения"
-msgstr[2] "%d новых сообщений"
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr "Правка"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:43
-#, c-format
-msgid "%d results"
-msgstr "%d результатов"
+#: ../src/client/accounts/add-edit-page.vala:282
+#| msgid "_Previous"
+msgid "Preview"
+msgstr "Предварительный просмотр"
 
-#. / Label displaying number of unread email messages in a folder
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:37
-#, c-format
-msgid "%d unread"
-msgid_plural "%d unread"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr "Зап_омнить пароли"
 
-#: ../../src/client/util/util-date.vala:170
-#, c-format
-msgid "%dh ago"
-msgstr "%dч тому назад"
+#: ../src/client/accounts/add-edit-page.vala:730 ../ui/login.glade.h:6
+msgid "Remem_ber password"
+msgstr "За_помнить пароль"
 
-#: ../../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgstr "%dмин тому назад"
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr "Не удалось подтвердить:\n"
 
-#: ../../src/client/views/conversation-find-bar.vala:222
-#, c-format
-msgid "%i matches"
-msgstr "%i совпадений"
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr "        &#8226; Неверный псевдоним учётной записи.\n"
 
-#: ../../src/client/views/conversation-find-bar.vala:224
-#, c-format
-msgid "%i matches (wrapped)"
-msgstr ""
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr "        &#8226; Адрес электронной почты уже добавлен в Geary.\n"
 
-#. / Datetime format for 12-hour time, i.e. 8:31 am
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:68
-msgid "%l:%M %P"
-msgstr "%l:%M %P"
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr "        &#8226; Ошибка подключения к IMAP.\n"
 
-#. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:74
-msgctxt "Default clock format"
-msgid "%l:%M %P"
-msgstr "%l:%M %P"
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr "        &#8226; Неверные имя пользователя или пароль IMAP.\n"
 
-#: ../../src/client/notification/libnotify.vala:107
-#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr "        &#8226; Ошибка подключения к SMTP.\n"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../../src/client/composer/composer-window.vala:981
-#, c-format
-msgid "%s (%s)"
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr "        &#8226; Неверные имя пользователя или пароль SMTP.\n"
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
 msgstr ""
+"        &#8226; Ошибка подключения.\n"
+"\n"
 
-#: ../../src/client/views/conversation-web-view.vala:289
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - Conversation Inspector"
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr "        &#8226; Неверные имя пользователя или пароль.\n"
 
-#: ../../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - Новых Сообщений"
+#: ../src/client/application/geary-application.vala:19
+#| msgid "Copyright 2011-2014 Yorba Foundation"
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr "Авторское право © 2011-2015 Yorba Foundation"
 
-#. / The quoted header for a message being replied to (in case the date is not known).
-#. / %s will be replaced by the original sender.
-#: ../../src/engine/rfc822/rfc822-utils.vala:178
-#, c-format
-msgid "%s wrote:"
-msgstr "%s писал:"
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr "Посетить веб-сайт Yorba"
 
-#: ../../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr "Запускать Geary свёрнутым"
 
-#. / This string represents the divider between two messages: "n messages" and "n unread",
-#. / shown in the folder list as a tooltip.  Please use your languages conventions for
-#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:43
-#, c-format
-msgid "%s, %s"
-msgstr ""
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr "Выводить отладочную информацию"
 
-#: ../../src/client/views/conversation-viewer.vala:246
-#, c-format
-msgid "%u conversations selected."
-msgstr "%u бесед выбрано."
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr "Записывать мониторинг бесед"
 
-#: ../../src/client/views/conversation-viewer.vala:743
-#, c-format
-msgid "%u read messages"
-msgstr "%u прочитано сообщений"
+# What is "deserialization"?
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr "Записывать десериализацию сети"
 
-#. / Date format for dates within a different year, i.e. 02/04/10
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:83
-#, no-c-format
-msgid "%x"
-msgstr "%x"
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr "Записывать сетевую активность"
 
-#: ../../src/client/util/util-email.vala:30
-msgid "(no subject)"
-msgstr "(без темы)"
+#. / The IMAP replay queue is how changes on the server are replicated on the client.
+#. / It could also be called the IMAP events queue.
+#: ../src/client/application/geary-args.vala:17
+msgid "Log IMAP replay queue"
+msgstr "Записывать ответ IMAP"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Переадресованное сообщение ----------"
+#. / Serialization is how commands and responses are converted into a stream of bytes for
+#. / network transmission
+#: ../src/client/application/geary-args.vala:20
+msgid "Log network serialization"
+msgstr "Записывать сериализацию сети"
 
-#: ../../src/client/accounts/add-edit-page.vala:211
-msgid "1 month back"
-msgstr "1 месяц назад"
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr "Записывать периодическую активность"
 
-#: ../../src/client/accounts/add-edit-page.vala:214
-msgid "1 year back"
-msgstr "1 год назад"
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr "Записывать запросы базы данных (создаёт множество сообщений)"
 
-#: ../../src/client/accounts/add-edit-page.vala:210
-msgid "2 weeks back"
-msgstr "2 недели назад"
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr "Записывать синхронизацию папки"
 
-#: ../../src/client/accounts/add-edit-page.vala:212
-msgid "3 months back"
-msgstr "3 месяца назад"
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr "Разрешить проверку WebView"
 
-#: ../../src/client/accounts/add-edit-page.vala:213
-msgid "6 months back"
-msgstr "6 месяцев назад"
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr "Отозвать все сертификаты серверов с предупреждениями TLS "
 
-#: ../../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> "
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+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 gives a command-line hint on how to open new composer windows with mailto:
+#: ../src/client/application/geary-args.vala:51
+#, c-format
+msgid "Use %s to open a new composer window"
+msgstr "Используйте %s для открытия нового окна редактора"
 
-#: ../../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 ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr "Комментарии, пожелания и найденные ошибки отправляйте:"
 
-#: ../../src/client/geary-controller.vala:1491
+#. i18n: Command line arguments are invalid
+#: ../src/client/application/geary-args.vala:59
 #, c-format
-msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr "Файл «%s» уже существует.  Хотите заменить его?"
-
-#: ../../src/client/geary-controller.vala:245
-msgid "A_ccounts"
-msgstr "Учетные записи"
+msgid "Failed to parse command line options: %s\n"
+msgstr "Не удалось разобрать параметры командной строки: %s\n"
 
-#: ../../src/client/geary-controller.vala:1227
+#: ../src/client/application/geary-args.vala:70
 #, c-format
-msgid "About %s"
-msgstr "О %s"
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr "Неизвестный параметр командной строки «%s»\n"
 
-#: ../../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "Учетные записи"
+#: ../src/client/application/geary-controller.vala:62
+#| msgid "Move conversation"
+msgid "Delete conversation"
+msgstr "Удалить беседу"
 
-#: ../../ui/account_list.glade:71
-msgid "Add account"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:63
+msgid "Delete conversation (Shift+Delete)"
+msgstr "Удалить беседу (Shift+Delete)"
 
-#: ../../src/client/geary-controller.vala:304
-msgid "Add label"
-msgstr "Добавить метку"
+#: ../src/client/application/geary-controller.vala:64
+msgid "Delete conversations (Shift+Delete)"
+msgstr "Удалить беседы (Shift+Delete)"
 
-#: ../../src/client/geary-controller.vala:57
-msgid "Add label to conversation"
-msgstr "Отметить беседу"
+#. This refers to the action ("move email to the trash"), not the Trash folder itself
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr "Переместить беседу в корзину (Delete, Backspace)"
 
-#: ../../src/client/geary-controller.vala:58
-msgid "Add label to conversations"
+#: ../src/client/application/geary-controller.vala:69
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr "Переместить беседы в корзину (Delete, Backspace)"
+
+#. This refers to the action ("archive an email"), not the Archive folder itself
+#: ../src/client/application/geary-controller.vala:73
+msgid "_Archive"
+msgstr "_Архивировать"
+
+#: ../src/client/application/geary-controller.vala:74
+msgid "Archive conversation (A)"
+msgstr "Архивировать беседу (A)"
+
+#: ../src/client/application/geary-controller.vala:75
+msgid "Archive conversations (A)"
+msgstr "Архивировать беседы (A)"
+
+#: ../src/client/application/geary-controller.vala:78
+msgid "Mark as S_pam"
+msgstr "Отметить как С_пам"
+
+#: ../src/client/application/geary-controller.vala:79
+msgid "Mark as not S_pam"
+msgstr "Отметить как _не Спам"
+
+#: ../src/client/application/geary-controller.vala:81
+#: ../src/client/application/geary-controller.vala:397
+msgid "Mark conversation"
 msgstr "Отметить беседу"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "Вся почта"
+#: ../src/client/application/geary-controller.vala:82
+msgid "Mark conversations"
+msgstr "Отметить беседы"
 
-#: ../../ui/remove_confirm.glade:58
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Все письма связанные с этой учетной записью будут удалены с Вашего "
-"компьютера. Это не коснется писем на сервере."
+#: ../src/client/application/geary-controller.vala:83
+msgid "Add label to conversation"
+msgstr "Добавить метку беседе"
 
-#: ../../src/client/geary-args.vala:24
-msgid "Allow inspection of WebView"
-msgstr "Allow inspection of WebView"
+#: ../src/client/application/geary-controller.vala:84
+msgid "Add label to conversations"
+msgstr "Добавить метку беседам"
 
-#: ../../src/client/views/conversation-viewer.vala:509
-msgid "Always Show From Sender"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:85
+#: ../src/client/application/geary-controller.vala:436
+msgid "Move conversation"
+msgstr "Переместить беседу"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:86
+msgid "Move conversations"
+msgstr "Переместить беседы"
 
-#: ../../src/client/geary-controller.vala:48
-msgid "Archive conversation (Delete, Backspace, A)"
-msgstr "Архивировать беседу (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:373
+msgid "A_ccounts"
+msgstr "_Учётные записи"
 
-#: ../../src/client/geary-controller.vala:49
-msgid "Archive conversations (Delete, Backspace, A)"
-msgstr "Архивировать беседы (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:378
+#: ../src/client/components/stock.vala:27
+msgid "_Preferences"
+msgstr "_Параметры"
 
-#: ../../src/client/geary-controller.vala:1477
-#, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr "Уверены, что хотите открыть «%s»?"
+#: ../src/client/application/geary-controller.vala:382
+#: ../src/client/components/stock.vala:25
+msgid "_Help"
+msgstr "_Справка"
 
-#: ../../src/client/geary-controller.vala:1478
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
-msgstr ""
-"Вложения могут быть опасны для вашего компьютера. Открывайте вложения только "
-"от адресантов которым доверяете."
+#: ../src/client/application/geary-controller.vala:386
+#: ../src/client/components/stock.vala:21
+msgid "_About"
+msgstr "_О приложении"
 
-#: ../../src/client/views/conversation-viewer.vala:614
-msgid "Bcc:"
-msgstr "Скрытая копия:"
+#: ../src/client/application/geary-controller.vala:390
+msgid "_Donate"
+msgstr "Помочь _разработчикам"
 
-#: ../../ui/composer.glade:113
-msgid "Bold (Ctrl+B)"
-msgstr "Bold (Ctrl+B)"
+#: ../src/client/application/geary-controller.vala:394
+#: ../src/client/components/stock.vala:29
+msgid "_Quit"
+msgstr "_Завершить"
 
-#: ../../ui/composer.glade:69
-msgid "C_olor"
-msgstr "_Цвет"
+#: ../src/client/application/geary-controller.vala:399
+msgid "_Mark as..."
+msgstr "_Отметить как…"
 
-#: ../../src/client/composer/composer-window.vala:926
-msgid "Cannot add attachment"
-msgstr "Не может быть прикреплен"
+#: ../src/client/application/geary-controller.vala:405
+msgid "Mark as _Read"
+msgstr "Отметить как _Прочитанное"
 
-#: ../../src/client/views/conversation-viewer.vala:611
-msgid "Cc:"
-msgstr "Копия:"
+#: ../src/client/application/geary-controller.vala:411
+msgid "Mark as _Unread"
+msgstr "Отметить как _Непрочитанное"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:223
-#, c-format
-msgid "Cc: %s\n"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:417
+msgid "_Star"
+msgstr "_Добавить в избранное"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "Выберите файл"
+#: ../src/client/application/geary-controller.vala:422
+msgid "U_nstar"
+msgstr "_Убрать из избранных"
 
-#: ../../src/client/geary-controller.vala:553
-msgid "Co_ntinue"
-msgstr "Пр_одолжить"
+#: ../src/client/application/geary-controller.vala:432
+msgid "Add label"
+msgstr "Добавить метку"
 
-#: ../../src/client/geary-application.vala:29
-msgid "Compose Message"
-msgstr "Создать сообщение"
+#: ../src/client/application/geary-controller.vala:433
+msgid "_Label"
+msgstr "_Метка"
+
+#: ../src/client/application/geary-controller.vala:437
+msgid "_Move"
+msgstr "_Переместить"
 
-#: ../../src/client/geary-controller.vala:313
+#: ../src/client/application/geary-controller.vala:441
 msgid "Compose new message (Ctrl+N, N)"
-msgstr "Начать новую беседу (Ctrl+N, N)"
+msgstr "Создать новую беседу (Ctrl+N, N)"
 
-#: ../../ui/preferences.glade:117
-msgid "Composer"
-msgstr "Редактор писем"
+#. Reply to a message.
+#: ../src/client/application/geary-controller.vala:445
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
+msgid "_Reply"
+msgstr "_Ответить"
 
-#: ../../src/client/views/conversation-viewer.vala:897
-msgid "Copy _Email Address"
-msgstr "Копировать _адрес"
+#: ../src/client/application/geary-controller.vala:446
+msgid "Reply (Ctrl+R, R)"
+msgstr "Ответить (Ctrl+R, R)"
 
-#: ../../src/client/views/conversation-viewer.vala:902
-msgid "Copy _Link"
-msgstr "Копировать _ссылку"
+#: ../src/client/application/geary-controller.vala:450
+msgid "R_eply All"
+msgstr "О_тветить всем"
 
-#: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr "Copyright 2011-2013 Yorba Foundation"
+#: ../src/client/application/geary-controller.vala:451
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+msgstr "Ответить всем (Ctrl+Shift+R, Shift+R)"
 
-#: ../../ui/composer.glade:21
-msgid "Cu_t"
-msgstr "_Вырезать"
+#. Forward a message.
+#: ../src/client/application/geary-controller.vala:456
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
+msgid "_Forward"
+msgstr "_Переслать"
 
-#: ../../src/client/views/conversation-viewer.vala:620
-msgid "Date:"
-msgstr "Дата:"
+#: ../src/client/application/geary-controller.vala:457
+msgid "Forward (Ctrl+L, F)"
+msgstr "Переслать (Ctrl+L, F)"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "Дата: %s\n"
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty"
+msgstr "Очистить"
 
-#: ../../src/client/geary-controller.vala:43
-msgid "Delete conversation (Delete, Backspace, A)"
-msgstr "Удалить беседу (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:497
+msgid "Empty Spam or Trash folders"
+msgstr "Очистить Корзину или Спам"
 
-#: ../../src/client/geary-controller.vala:44
-msgid "Delete conversations (Delete, Backspace, A)"
-msgstr "Удалить беседы (Delete, Backspace, A)"
+#: ../src/client/application/geary-controller.vala:501
+msgid "Empty _Spam…"
+msgstr "Очистить _Спам…"
 
-#: ../../src/client/geary-args.vala:25
-msgid "Display program version"
-msgstr "Показать версию программы"
+#: ../src/client/application/geary-controller.vala:505
+msgid "Empty _Trash…"
+msgstr "Очистить _Корзину…"
 
-#: ../../src/client/composer/composer-window.vala:663
-msgid "Do you want to discard the unsaved message?"
-msgstr "Хотите отменить несохраненное сообщение?"
+#. No callback is connected, since we bind the toggle button to the search bar visibility
+#: ../src/client/application/geary-controller.vala:538
+msgid "Toggle search bar"
+msgstr "Включить панель поиска"
 
-#: ../../src/client/composer/composer-window.vala:666
-msgid "Do you want to discard this message?"
-msgstr "Хотите отменить несохраненное сообщение?"
+#: ../src/client/application/geary-controller.vala:752
+msgid "Unable to store server trust exception"
+msgstr "Не удалось добавить исключение безопасности сервера"
 
-#: ../../src/client/geary-controller.vala:1479
-msgid "Don't _ask me again"
-msgstr "Не _спрашивать меня снова"
+#: ../src/client/application/geary-controller.vala:989
+msgid "Your settings are insecure"
+msgstr "Параметры небезопасны"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "Черновики"
+#: ../src/client/application/geary-controller.vala:990
+msgid ""
+"Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
+"username and password could be read by another person on the network.  Are "
+"you sure you want to do this?"
+msgstr ""
+"В параметрах IMAP или SMTP не указано SSL или TLS шифрование. Это означает, "
+"что ваши имя пользователя и пароль могут быть перехвачены сторонними лицами. "
+"Уверены, что хотите продолжить?"
 
-#: ../../ui/composer.glade:419
-msgid "Drop files here"
-msgstr "Перетащите файлы сюда"
+#: ../src/client/application/geary-controller.vala:991
+msgid "Co_ntinue"
+msgstr "_Продолжить"
 
-#: ../../ui/login.glade:115
-msgid "E_mail address:"
-msgstr ""
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:1069
+#: ../src/client/components/status-bar.vala:29
+msgid "Error sending email"
+msgstr "Ошибка отправки эл. почты"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "E_xit"
+#: ../src/client/application/geary-controller.vala:1070
+msgid ""
+"Geary encountered an error sending an email.  If the problem persists, "
+"please manually delete the email from your Outbox folder."
 msgstr ""
+"В Geary произошла ошибка при отправке электронной почты. Если проблема не "
+"устраняется, вручную удалите почту из папки «Исходящие»."
 
-#: ../../src/client/views/conversation-viewer.vala:533
-msgid "Edit Draft"
-msgstr ""
+#. Displayed in the space-limited status bar when a message fails to be uploaded
+#. to Sent Mail after being sent.
+#: ../src/client/application/geary-controller.vala:1074
+#: ../src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
+msgstr "Ошибка сохранения отправленной почты"
 
-#: ../../ui/account_list.glade:84
-msgid "Edit account"
+#: ../src/client/application/geary-controller.vala:1075
+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/remove_confirm.glade:94
-msgid "Email address:"
-msgstr "Адрес почты:"
+#: ../src/client/application/geary-controller.vala:1144
+msgid "Labels"
+msgstr "Метки"
 
-#: ../../src/client/geary-application.vala:28
-msgid "Email;E-mail;Mail;"
-msgstr ""
+#. give the user two options: reset the Account local store, or exit Geary.  A third
+#. could be done to leave the Account in an unopened state, but we don't currently
+#. have provisions for that.
+#: ../src/client/application/geary-controller.vala:1156
+#, c-format
+msgid "Unable to open the database for %s"
+msgstr "Не удалось открыть базу данных для %s"
 
-#: ../../ui/preferences.glade:131
-msgid "Enable _spell checking"
-msgstr "Проверять _орфографию"
+#: ../src/client/application/geary-controller.vala:1157
+#, c-format
+msgid ""
+"There was an error opening the local mail database for this account. This is "
+"possibly due to corruption of the database file in this directory:\n"
+"\n"
+"%s\n"
+"\n"
+"Geary can rebuild the database and re-synchronize with the server or exit.\n"
+"\n"
+"Rebuilding the database will destroy all local email and its attachments. "
+"<b>The mail on the your server will not be affected.</b>"
+msgstr ""
+"Произошла ошибка при открытии локальной базы данных почты для этой учётной "
+"записи. Возможно, это произошло из-за повреждения файла базы данных в данном "
+"каталоге:\n"
+"\n"
+"%s\n"
+"\n"
+"Geary может пересоздать базу данных и выполнить повторную синхронизацию с "
+"сервером или завершить работу.\n"
+"\n"
+"Пересоздание базы данных уничтожит все локальные письма и их вложения. "
+"<b>Операция не затронет почту, хранящуюся на сервере.</b>"
 
-#: ../../ui/login.glade:588
-msgid "Encr_yption:"
-msgstr "Ши_фрование:"
+#: ../src/client/application/geary-controller.vala:1159
+msgid "_Rebuild"
+msgstr "Пересоздать"
 
-#: ../../ui/login.glade:607
-msgid "Encrypt_ion:"
-msgstr "Шиф_рование:"
+#: ../src/client/application/geary-controller.vala:1159
+msgid "E_xit"
+msgstr "_Завершить"
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-msgid "Enter your account information to get started."
-msgstr "Чтобы начать введите информацию об аккаунте."
+#: ../src/client/application/geary-controller.vala:1168
+#, c-format
+msgid "Unable to rebuild database for \"%s\""
+msgstr "Не удалось пересоздать базу данных для «%s»"
 
-#: ../../src/client/geary-controller.vala:714
+#: ../src/client/application/geary-controller.vala:1169
 #, c-format
 msgid ""
 "Error during rebuild:\n"
 "\n"
 "%s"
 msgstr ""
+"Ошибка пересоздания:\n"
+"\n"
+"%s"
 
-#: ../../src/client/composer/composer-window.vala:43
-msgid "Error saving"
-msgstr "Ошибка сохранения"
+#. some other problem opening the account ... as with other flow path, can't run
+#. Geary today with an account in unopened state, so have to exit
+#: ../src/client/application/geary-controller.vala:1191
+#: ../src/client/application/geary-controller.vala:1201
+#: ../src/client/application/geary-controller.vala:1212
+#, c-format
+msgid "Unable to open local mailbox for %s"
+msgstr "Не удалось открыть локальный почтовый ящик для %s"
 
-#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../../src/client/geary-controller.vala:625
-#: ../../src/client/ui/status-bar.vala:28
-msgid "Error sending email"
-msgstr "Ошибка отправки почты"
+#: ../src/client/application/geary-controller.vala:1192
+#, 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/accounts/add-edit-page.vala:216
-msgid "Everything"
-msgstr "Все"
+#: ../src/client/application/geary-controller.vala:1202
+msgid ""
+"The version number of the local mail database is formatted for a newer "
+"version of Geary. Unfortunately, the database cannot be \"rolled back\" to "
+"work with this version of Geary.\n"
+"\n"
+"Please install the latest version of Geary and try again."
+msgstr ""
+"Версия локальной базы данных почты имеет формат более новой версии Geary. К "
+"сожалению, невозможно произвести изменение базы данных для работы с этой "
+"версией Geary.\n"
+"\n"
+"Установите последнюю версию Geary и попробуйте снова.  "
 
-#: ../../src/client/views/conversation-viewer.vala:1897
-msgid "Failed to open default text editor."
-msgstr "Не получилось запустить текстовый редактор по-умолчанию."
+#: ../src/client/application/geary-controller.vala:1213
+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/geary-args.vala:54
+#: ../src/client/application/geary-controller.vala:1721
 #, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Не получилось распознать аргументы командной строки: %s\n"
+msgid "About %s"
+msgstr "О %s"
 
-#. / Placeholder text indicating that the user should type their first name and last name
-#: ../../src/client/accounts/add-edit-page.vala:10
-msgid "First Last"
+#. / Translators: add your name and email address to receive credit in the About dialog
+#. / For example: Yamada Taro <yamada taro example com>
+#: ../src/client/application/geary-controller.vala:1724
+msgid "translator-credits"
+msgstr "Stas Solovey <whats_up tut by>, 2015."
+
+#: ../src/client/application/geary-controller.vala:1990
+#| msgid "Underline (Ctrl+U)"
+msgid "Undo move (Ctrl+Z)"
+msgstr "Отменить перемещение (Ctrl+U)"
+
+#: ../src/client/application/geary-controller.vala:2000
+#, c-format
+msgid "Are you sure you want to open \"%s\"?"
+msgstr "Действительно открыть «%s»?"
+
+#: ../src/client/application/geary-controller.vala:2001
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
 msgstr ""
+"Вложения при открытии могут нанести ущерб системе. Открывайте вложения "
+"только от надёжных источников."
 
-#: ../../ui/composer.glade:182
-msgid "Fixed Width"
+#: ../src/client/application/geary-controller.vala:2002
+msgid "Don't _ask me again"
+msgstr "Не _спрашивать снова"
+
+#: ../src/client/application/geary-controller.vala:2020
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr "Файл с именем «%s» уже существует. Заменить его?"
+
+#: ../src/client/application/geary-controller.vala:2022
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
+"Файл уже существует в «%s». Его замена приведёт к полной перезаписи его "
+"содержимого."
 
-#: ../../src/client/geary-controller.vala:329
-msgid "Forward (Ctrl+L, F)"
-msgstr "Переслать (Ctrl+L, F)"
+#: ../src/client/application/geary-controller.vala:2025
+msgid "_Replace"
+msgstr "_Заменить"
 
-#: ../../src/client/views/conversation-viewer.vala:605
-msgid "From:"
-msgstr "От:"
+#. Find out what to do with the inline composers.
+#. TODO: Remove this in favor of automatically saving drafts
+#: ../src/client/application/geary-controller.vala:2323
+msgid "Close open draft messages?"
+msgstr "Закрыть черновик?"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:215
+#: ../src/client/application/geary-controller.vala:2453
 #, c-format
-msgid "From: %s\n"
-msgstr "Кому: %s\n"
+msgid "Empty all email from your %s folder?"
+msgstr "Очистить все письма папки %s?"
 
-#: ../../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "ГБ"
+#: ../src/client/application/geary-controller.vala:2454
+msgid "This removes the email from Geary and your email server."
+msgstr "Удаляет все письма из Geary и почтового сервера."
 
-#: ../../src/client/geary-application.vala:25
-msgid "Geary Mail"
-msgstr "Geary Mail"
+#: ../src/client/application/geary-controller.vala:2455
+#| msgid "\"%s\" could not be found."
+msgid "This cannot be undone."
+msgstr "Это не может быть отменено."
 
-#: ../../src/client/geary-controller.vala:626
-msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
-msgstr ""
-"Geary обнаружила ошибку при отправке почты. Если проблема не решится, "
-"удалите пожалуйста вручную почту  из вашей папки Исходящие."
+#: ../src/client/application/geary-controller.vala:2456
+#, c-format
+msgid "Empty %s"
+msgstr "Очистить %s"
 
-#: ../../ui/password-dialog.glade:315
-msgid "General"
-msgstr ""
+#: ../src/client/application/geary-controller.vala:2473
+#, c-format
+#| msgid "Error saving"
+msgid "Error emptying %s"
+msgstr "Ошибка очистки %s"
+
+#: ../src/client/application/geary-controller.vala:2503
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] "Безвозвратно удалить это сообщение?"
+msgstr[1] "Безвозвратно удалить эти сообщения?"
+msgstr[2] "Безвозвратно удалить эти сообщения?"
+
+#: ../src/client/application/geary-controller.vala:2505
+msgid "Delete"
+msgstr "_Удалить"
 
-#: ../../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/client/application/geary-controller.vala:2536
+#| msgid "Underline (Ctrl+U)"
+msgid "Undo archive (Ctrl+Z)"
+msgstr "Отменить архивирование (Ctrl+Z)"
 
-#: ../../ui/password-dialog.glade:133
-msgid "IMAP Credentials"
-msgstr "Настройки IMAP"
+#: ../src/client/application/geary-controller.vala:2551
+#| msgid "Unquote text (Ctrl+[)"
+msgid "Undo trash (Ctrl+Z)"
+msgstr "Отменить перемещение в корзину (Ctrl+Z)"
 
-#: ../../ui/login.glade:572
-msgid "IMAP password"
-msgstr "Пароль IMAP"
+#: ../src/client/application/geary-controller.vala:2604
+#| msgid "Underline (Ctrl+U)"
+msgid "Undo (Ctrl+Z)"
+msgstr "Отменить (Ctrl+Z)"
 
-#: ../../ui/login.glade:286 ../../ui/password-dialog.glade:334
-msgid "IMAP settings"
-msgstr "Настройки IMAP"
+#: ../src/client/components/conversation-find-bar.vala:214
+#, c-format
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i совпадение"
+msgstr[1] "%i совпадения"
+msgstr[2] "%i совпадений"
 
-#: ../../ui/login.glade:556
-msgid "IMAP username"
-msgstr "Имя пользователя IMAP"
+#: ../src/client/components/conversation-find-bar.vala:216
+#, c-format
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] "%i совпадение (от начала)"
+msgstr[1] "%i совпадения (от начала)"
+msgstr[2] "%i совпадений (от начала)"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "Важное"
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr "не найдено"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "Входящие"
+#: ../src/client/components/main-window.vala:428
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "Входящие"
+#: ../src/client/components/search-bar.vala:10
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/engine/api/geary-special-folder-type.vala:51
+msgid "Search"
+msgstr "Поиск"
+
+#. Search entry.
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "Поиск по всей почте учётной записи по ключевым словам (Ctrl+S)"
 
-#: ../../src/client/ui/main-toolbar.vala:163
+#: ../src/client/components/search-bar.vala:118
 #, c-format
 msgid "Indexing %s account"
-msgstr ""
+msgstr "Индексируется учётная запись %s"
 
-#: ../../ui/composer.glade:120
-msgid "Italic (Ctrl+I)"
-msgstr "Italic (Ctrl+I)"
+#: ../src/client/components/search-bar.vala:129
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#, c-format
+msgid "Search %s account"
+msgstr "Поиск учётной записи %s"
 
-#: ../../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-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/geary-controller.vala:689
-msgid "Labels"
-msgstr "Метки"
+#: ../src/client/components/stock.vala:18
+#: ../ui/account_cannot_remove.glade.h:3
+msgid "_OK"
+msgstr "_ОК"
 
-#: ../../ui/composer.glade:151
-msgid "Lar_ge"
-msgstr "Круп_ный"
+#: ../src/client/components/stock.vala:19
+#: ../ui/edit_alternate_emails.glade.h:3 ../ui/password-dialog.glade.h:5
+#: ../ui/remove_confirm.glade.h:5
+msgid "_Cancel"
+msgstr "О_тмена"
 
-#: ../../ui/composer.glade:152
-msgid "Large"
-msgstr "Большой"
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Закрыть"
 
-#: ../../ui/composer.glade:62
-msgid "Link (Ctrl+L)"
-msgstr "Ссылка (Ctrl+L)"
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr "От_казаться"
 
-#. / The IMAP replay queue is how changes on the server are replicated on the client.
-#. / It could also be called the IMAP events queue.
-#: ../../src/client/geary-args.vala:16
-msgid "Log IMAP replay queue"
-msgstr "Записывать ответ IMAP"
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "Отк_рыть"
 
-#: ../../src/client/geary-args.vala:11
-msgid "Log conversation monitoring"
-msgstr "Записывать мониторинг бесед"
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr "_Печать…"
 
-#: ../../src/client/geary-args.vala:21
-msgid "Log database queries (generates lots of messages)"
-msgstr "Записывать запросы к БД (создает уйму сообщений)"
+#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
+msgid "_Remove"
+msgstr "_Удалить"
 
-#. / "Normalization" can also be called "synchronization"
-#: ../../src/client/geary-args.vala:23
-msgid "Log folder normalization"
-msgstr "Записывать нормализацию папки"
+#. Select all.
+#: ../src/client/components/stock.vala:32
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+msgid "Select _All"
+msgstr "Выбрать _все"
 
-#: ../../src/client/geary-args.vala:13
-msgid "Log network activity"
-msgstr "Записывать сетевую активность"
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr "О_ставить"
 
-#: ../../src/client/geary-args.vala:12
-msgid "Log network deserialization"
-msgstr ""
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr "Сохранён"
 
-#. / Serialization is how commands and responses are converted into a stream of bytes for
-#. / network transmission
-#: ../../src/client/geary-args.vala:19
-msgid "Log network serialization"
-msgstr "Записывать сериализацию сетевых сообщений"
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr "Сохраняется"
 
-#: ../../src/client/geary-args.vala:20
-msgid "Log periodic activity"
-msgstr "Записывать периодическую активность"
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr "Ошибка сохранения"
 
-#: ../../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "МБ"
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr "Нажмите клавишу Backspace для удаления цитаты"
 
-#: ../../src/client/geary-application.vala:26
-msgid "Mail Client"
-msgstr "Почтовый клиент"
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr "Новое сообщение"
 
-#: ../../src/client/views/conversation-viewer.vala:1479
-msgid "Mark Unread From _Here"
+#. A list of keywords, separated by pipe ("|") characters, that suggest an attachment; since
+#. this is full-word checking, include all variants of each word.  No spaces are allowed.
+#: ../src/client/composer/composer-widget.vala:138
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
+"enclosing|encloses|enclosure|enclosures"
 msgstr ""
+"прикрепить|прикрепление|прикрепления|прикреплён|прикреплены|вложение|"
+"вложенные|вложения"
 
-#: ../../src/client/geary-controller.vala:52
-msgid "Mark as S_pam"
-msgstr "Отметить как С_пам"
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr "Отказаться от этого сообщения?"
 
-#: ../../src/client/geary-controller.vala:277
-msgid "Mark as _Read"
-msgstr "Отметить как _Прочитанное"
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr "Отправить сообщение с пустой темой и без текста?"
 
-#: ../../src/client/geary-controller.vala:283
-msgid "Mark as _Unread"
-msgstr "Отметить как _Непрочитанное"
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr "Отправить сообщение с пустой темой?"
 
-#: ../../src/client/geary-controller.vala:53
-msgid "Mark as not S_pam"
-msgstr "Пометить как не С_пам"
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr "Отправить сообщение без текста?"
 
-#: ../../src/client/geary-controller.vala:55
-#: ../../src/client/geary-controller.vala:269
-msgid "Mark conversation"
-msgstr "Отметить беседу"
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr "Отправить сообщение без прикреплённых файлов?"
 
-#: ../../src/client/geary-controller.vala:56
-msgid "Mark conversations"
-msgstr "Отметить беседы"
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr "Невозможно добавить вложение"
 
-#: ../../src/client/views/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "Я"
+#: ../src/client/composer/composer-widget.vala:1541
+#, c-format
+msgid "\"%s\" could not be found."
+msgstr "Невозможно найти «%s»."
 
-#: ../../ui/composer.glade:158
-msgid "Medium"
-msgstr "Средний"
+#: ../src/client/composer/composer-widget.vala:1548
+#, c-format
+msgid "\"%s\" is a folder."
+msgstr "«%s» является каталогом."
 
-#: ../../ui/composer.glade:75
-msgid "More options"
-msgstr "Дополнительные настройки"
+#: ../src/client/composer/composer-widget.vala:1555
+#, c-format
+msgid "\"%s\" is an empty file."
+msgstr "«%s» — пустой файл."
 
-#: ../../src/client/geary-controller.vala:59
-#: ../../src/client/geary-controller.vala:308
-msgid "Move conversation"
-msgstr "Переместить беседу"
+#: ../src/client/composer/composer-widget.vala:1569
+#, c-format
+msgid "\"%s\" could not be opened for reading."
+msgstr "Невозможно открыть для чтения «%s»."
 
-#: ../../src/client/geary-controller.vala:60
-msgid "Move conversations"
-msgstr "Переместить беседы"
+#: ../src/client/composer/composer-widget.vala:1576
+#, c-format
+msgid "\"%s\" already attached for delivery."
+msgstr "«%s» уже вложено в письмо."
 
-#: ../../ui/login.glade:176
-msgid "N_ame:"
-msgstr "И_мя:"
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../../ui/login.glade:230
-msgid "N_ickname:"
-msgstr "N_ickname:"
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr "Кому: "
 
-#: ../../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "Новое сообщение"
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr "Копия: "
 
-#: ../../ui/remove_confirm.glade:80
-msgid "Nickname:"
-msgstr "Псевдоним:"
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr "Скрытая копия:"
 
-#: ../../ui/login.glade:661
-msgid "No authentication re_quired"
-msgstr "Аудентификация не требуется"
+#: ../src/client/composer/composer-widget.vala:1654
+#| msgid "_Reply"
+msgid "Reply-To: "
+msgstr "Ответить: "
 
-#: ../../src/client/views/conversation-viewer.vala:275
-msgid "No conversations in folder."
-msgstr ""
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr "Выбрать цвет"
+
+#. Displayed in the From dropdown to indicate an "alternate email address"
+#. for an account.  The first printf argument will be the alternate email
+#. address, and the second will be the account's primary email address.
+#: ../src/client/composer/composer-widget.vala:2322
+#, c-format
+msgid "%1$s via %2$s"
+msgstr "%1$s через %2$s"
 
-#: ../../src/client/views/conversation-viewer.vala:244
+#. Composer label (with mnemonic underscore) for the account selector
+#. when choosing what address to send a message from.
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_От:"
+
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "Я"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
 msgid "No conversations selected."
 msgstr "Беседы не выбраны."
 
-#: ../../src/client/views/conversation-viewer.vala:273
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+#, c-format
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] "%u беседа выбрана."
+msgstr[1] "%u беседы выбрано."
+msgstr[2] "%u бесед выбрано."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
 msgid "No search results found."
 msgstr "Нет результатов поиска."
 
-#: ../../src/client/dialogs/password-dialog.vala:128
-#: ../../src/engine/api/geary-special-folder-type.vala:58
-msgid "None"
-msgstr "Ничего"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
+msgstr "В папке нет сообщений."
 
-#: ../../ui/preferences.glade:158
-msgid "Notifications"
-msgstr "Уведомления"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
+msgstr "Данное сообщение содержит изображения."
 
-#: ../../src/client/util/util-date.vala:164
-msgid "Now"
-msgstr "Сейчас"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr "Показать изображения"
 
-#. / The quoted header for a message being replied to.
-#. / %1$s will be substituted for the date, and %2$s will be substituted for
-#. / the original sender.
-#: ../../src/engine/rfc822/rfc822-utils.vala:171
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
+msgstr "Всегда показывать изображения от отправителя"
 
-#. / The quoted header for a message being replied to (in case the sender is not known).
-#. / %s will be replaced by the original date
-#: ../../src/engine/rfc822/rfc822-utils.vala:184
-#, c-format
-msgid "On %s:"
-msgstr ""
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
+msgstr "Редактировать черновик"
 
-#: ../../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "Открыть"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "От:"
 
-#: ../../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "Остальное"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr "Кому:"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "Исходящие"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr "Копия:"
 
-#: ../../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr "Скрытая копия:"
 
-#: ../../src/client/geary-args.vala:10
-msgid "Output debugging information"
-msgstr "Вывести отладочную информацию"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr "Тема:"
 
-#: ../../ui/login.glade:337
-msgid "P_ort:"
-msgstr "П_орт:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Дата:"
 
-#: ../../ui/login.glade:474
-msgid "Pass_word:"
-msgstr "Пар_оль:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+#, c-format
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] "%u сообщение прочитано"
+msgstr[1] "%u сообщения прочитаны"
+msgstr[2] "%u сообщений прочитано"
 
-#: ../../ui/login.glade:101
-msgid "Password"
-msgstr "Пароль"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+#, c-format
+msgid "This message was sent successfully, but could not be saved to %s."
+msgstr "Сообщение успешно отправлено, но не может быть сохранено в %s."
 
-#: ../../ui/password-dialog.glade:196
-msgid "Password:"
-msgstr "Пароль:"
+#. Add a menu item for copying the current selection.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+#: ../ui/composer.glade.h:4
+msgid "_Copy"
+msgstr "_Копировать"
 
-#: ../../ui/composer.glade:102
-msgid "Paste _With Formatting"
-msgstr ""
+#. Add a menu item for copying the address.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr "Копировать эл. _адрес"
 
-#: ../../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your email password"
-msgstr "Пожалуйста, введите свой пароль"
+#. Add a menu item for copying the link.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+#: ../ui/composer.glade.h:17
+msgid "Copy _Link"
+msgstr "Копировать _ссылку"
 
-#: ../../src/client/geary-args.vala:47
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Ваши комментарии, пожелания и найденные ошибки отправляйте на адрес:"
+#. Select message.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
+msgstr "Выбрать сообщение"
 
-#: ../../ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
-msgstr "Пожалуйста подождите пока Geary проверит Вашу учетную запись."
+#. Inspect.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr "_Проверить"
 
-#: ../../ui/login.glade:421
-msgid "Por_t:"
-msgstr "По_рт:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr "Кажется что эта ссылка ведёт на"
 
-#: ../../ui/password-dialog.glade:367 ../../ui/password-dialog.glade:470
-msgid "Port:"
-msgstr "Порт:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
+msgstr ", но на самом деле указывает на"
 
-#: ../../ui/composer.glade:81
-msgid "Quote text  (Ctrl+])"
-msgstr "Цитировать текст (Ctrl+])"
+#. If href doesn't look like a URL, something is fishy, so warn the user
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
+msgstr " (Небезопасная?)"
 
-#: ../../src/client/geary-controller.vala:322
-msgid "R_eply All"
-msgstr "О_тветить всем"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
+msgstr "_Сохранить изображение как…"
 
-#: ../../ui/preferences.glade:55
-msgid "Reading"
-msgstr "Чтение"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_Сохранить как…"
 
-#: ../../ui/password-dialog.glade:274
-msgid "Real name:"
-msgstr "Настоящее имя:"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr "Сохранить все в_ложения…"
 
-#: ../../src/client/accounts/add-edit-page.vala:590
-msgid "Remem_ber password"
-msgstr "За_помнить пароль"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] "Сохранить вложение…"
+msgstr[1] "Сохранить вложения…"
+msgstr[2] "Сохранить вложения…"
 
-#: ../../src/client/accounts/add-edit-page.vala:583
-msgid "Remem_ber passwords"
-msgstr "За_помнить пароли"
+#. Reply to all on a message.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr "Ответить _всем"
 
-#: ../../ui/account_list.glade:97
-msgid "Remove account"
-msgstr ""
+#. Mark as read/unread.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr "Отметить как _прочитанное"
 
-#: ../../ui/composer.glade:95
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "Удалить форматирование (Ctrl+Space) "
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr "Отметить как _непрочитанное"
 
-#: ../../src/client/geary-controller.vala:318
-msgid "Reply (Ctrl+R, R)"
-msgstr "Ответить (Ctrl+R, R)"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
+msgstr "Отметить как непрочитанные начиная с _этого"
 
-#: ../../src/client/geary-controller.vala:323
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
-msgstr "Ответить всем (Ctrl+Shift+R, Shift+R)"
+#. Separator.
+#. View original message source.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "_Показать исходник"
 
-#: ../../src/client/views/conversation-viewer.vala:1452
-msgid "Reply to _All"
-msgstr "Ответить _всем"
+#. Generate the attachment table.
+#. / Placeholder filename for attachments with no filename.
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+msgid "none"
+msgstr "нет"
 
-#: ../../ui/password-dialog.glade:163
-msgid "SMTP Credentials"
-msgstr "Настройки SMTP"
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr "Не удалось запустить текстовый редактор по-умолчанию."
 
-#: ../../ui/login.glade:507
-msgid "SMTP password"
-msgstr "SMTP пароль"
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+#, c-format
+msgid "%s - Conversation Inspector"
+msgstr "%s — Проверка сообщений"
 
-#: ../../ui/login.glade:439 ../../ui/password-dialog.glade:437
-msgid "SMTP settings"
-msgstr "Настройки SMTP"
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Выберите файл"
 
-#: ../../ui/login.glade:491
-msgid "SMTP username"
-msgstr "Имя пользователя SMTP"
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr "_Прикрепить"
 
-#: ../../src/client/dialogs/password-dialog.vala:124
-msgid "SSL"
-msgstr "SSL"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+#, c-format
+msgid "Untrusted Connection: %s"
+msgstr "Недоверенное соединение: %s"
 
-#: ../../ui/password-dialog.glade:382 ../../ui/password-dialog.glade:485
-msgid "SSL/TLS encryption:"
-msgstr "SSL/TLS шифрование:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+#, c-format
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr "Данные авторизации сервера почты %s на %s:%u не могут быть проверены."
 
-#: ../../src/client/dialogs/password-dialog.vala:126
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr ""
+"Выбор «Доверять этому серверу» или «Всегда доверять этому серверу» может "
+"привести к небезопасной передаче имени пользователя и пароля."
 
-#: ../../ui/composer.glade:169
-msgid "S_ans Serif"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
 msgstr ""
+"Выбор «Не доверять этому серверу» приведёт к потере доступа к этому серверу."
 
-#: ../../ui/composer.glade:175
-msgid "S_erif"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr "Geary не добавит и не изменит эту учётную запись."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
 msgstr ""
+"Выбор «Не доверять этому серверу» приведёт к остановке доступа к этому "
+"серверу."
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr "Geary завершит работу если нет других открытых учётных записей."
 
-#: ../../ui/login.glade:160
-msgid "S_ervice:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
 msgstr ""
+"Свяжитесь с системным администратором или с провайдером электронной почты "
+"если есть какие-либо вопросы по данным проблемам."
 
-#: ../../ui/composer.glade:170
-msgid "Sans Serif"
-msgstr "Sans Serif"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr "Сертификат сервера не подписан известным центром сертификации"
 
-#: ../../src/client/views/conversation-viewer.vala:1437
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "Сохранить вложение"
-msgstr[1] "Сохранить вложения"
-msgstr[2] "Сохранить в_се вложения"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr "Учётные данные сервера не совпадают с учётными данными в сертификате"
 
-#: ../../src/client/views/conversation-viewer.vala:1400
-msgid "Save All A_ttachments..."
-msgstr "Сохранить в_се вложения"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Сертификат сервера просрочен"
 
-#: ../../src/client/composer/composer-window.vala:41
-msgid "Saved"
-msgstr "Сохранен"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr "Сертификат сервера не был активирован"
 
-#: ../../src/client/composer/composer-window.vala:42
-msgid "Saving"
-msgstr "Сохраняю"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr "Сертификат сервера был отозван и теперь недействителен"
 
-#: ../../ui/login.glade:304
-msgid "Se_rver:"
-msgstr "Се_рвер:"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "Сертификат сервера считается небезопасным"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../../src/client/ui/main-toolbar.vala:10
-#: ../../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "Поиск"
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr "Произошла ошибка обработки сертификата сервера"
+
+#. We can't keep these in the glade file, because Gnome doesn't want markup in translatable
+#. strings, and Glade doesn't support the "larger" size attribute. See this bug report for
+#. details: https://bugzilla.gnome.org/show_bug.cgi?id=679006
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr "Geary требуется пароль эл. почты чтобы продолжить"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:39
-#: ../../src/client/ui/main-toolbar.vala:170
+#. Label displaying total number of email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
 #, c-format
-msgid "Search %s account"
-msgstr ""
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d сообщение"
+msgstr[1] "%d сообщения"
+msgstr[2] "%d сообщений"
 
-#: ../../src/client/ui/main-toolbar.vala:76
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr ""
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+#, c-format
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d непрочитанное"
+msgstr[1] "%d непрочитанных"
+msgstr[2] "%d непрочитанных"
 
-#: ../../src/client/composer/composer-window.vala:1243
-msgid "Select Color"
-msgstr "Выбрать цвет"
+#. / This string represents the divider between two messages: "n messages" and "n unread",
+#. / shown in the folder list as a tooltip.  Please use your languages conventions for
+#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:45
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../../src/client/ui/stock.vala:32
-#: ../../src/client/views/conversation-viewer.vala:916
-msgid "Select _All"
-msgstr "Выбрать _все"
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "Входящие"
 
-#: ../../src/client/views/conversation-viewer.vala:910
-msgid "Select _Message"
-msgstr ""
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] "%d результат"
+msgstr[1] "%d результата"
+msgstr[2] "%d результатов"
 
-#: ../../src/client/geary-application.vala:27
-msgid "Send and receive email"
-msgstr "Отправить и получить почту"
+#: ../src/client/notification/libmessagingmenu.vala:75
+#, c-format
+msgid "%s - New Messages"
+msgstr "Новые сообщения — %s"
 
-#: ../../src/client/composer/composer-window.vala:747
-msgid "Send message with an empty body?"
-msgstr "Отправить сообщение без текста в теле?"
+#: ../src/client/notification/libnotify.vala:72
+#, c-format
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d новое сообщение"
+msgstr[1] "%d новых сообщения"
+msgstr[2] "%d новых сообщений"
 
-#: ../../src/client/composer/composer-window.vala:743
-msgid "Send message with an empty subject and body?"
-msgstr "Отправить сообщение с пустой темой и телом?"
+#: ../src/client/notification/libnotify.vala:75
+#, c-format
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, всего %d новое сообщение"
+msgstr[1] "%s, всего %d новых сообщения"
+msgstr[2] "%s, всего %d новых сообщений"
 
-#: ../../src/client/composer/composer-window.vala:745
-msgid "Send message with an empty subject?"
-msgstr "Отправить сообщение с пустой темой?"
+#: ../src/client/notification/libnotify.vala:107
+#, c-format
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+"%s\n"
+"(%d другое сообщение для %s)"
+msgstr[1] ""
+"%s\n"
+"(%d других сообщения для %s)"
+msgstr[2] ""
+"%s\n"
+"(%d других сообщений для %s)"
 
-#: ../../src/client/composer/composer-window.vala:749
-msgid "Send message without an attachment?"
-msgstr "Отправить сообщение без прикрепленных файлов?"
+#: ../src/client/notification/libnotify.vala:160
+msgid "Open"
+msgstr "Открыть"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../../src/client/ui/status-bar.vala:25
-msgid "Sending..."
-msgstr "Отправка..."
+#. / Datetime format for 12-hour time, i.e. 8:31 am
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:68
+msgid "%l:%M %P"
+msgstr "%l:%M %P"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Отправленные"
+#. / Datetime format for 24-hour time, i.e. 16:35
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:71
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: ../../ui/login.glade:404
-msgid "Ser_ver:"
-msgstr "Сер_вер:"
+#. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:74
+msgctxt "Default clock format"
+msgid "%l:%M %P"
+msgstr "%l:%M %P"
 
-#: ../../ui/composer.glade:176
-msgid "Serif"
-msgstr "Serif"
+#. / Date format for dates within the current year, i.e. Nov 8
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:78
+msgid "%b %-e"
+msgstr "%-e %b."
 
-#: ../../ui/password-dialog.glade:352 ../../ui/password-dialog.glade:455
-msgid "Server:"
-msgstr "Сервер:"
+#. / Date format for dates within a different year, i.e. 02/04/10
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:83
+#, no-c-format
+msgid "%x"
+msgstr "%x"
 
-#: ../../ui/password-dialog.glade:259
-msgid "Service:"
-msgstr "Сервис:"
+#. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:88
+msgid "%B %-e, %Y %-l:%M %P"
+msgstr "%-e %b. %Y, %-l:%M %P"
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "Show Images"
-msgstr "Показать изображения"
+#. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:91
+msgid "%B %-e, %Y %-H:%M"
+msgstr "%-e %b. %Y, %-H:%M"
 
-#: ../../ui/preferences.glade:193
-msgid "Show _notifications for new mail"
-msgstr "_Показывать уведомления о новых сообщениях"
+#. / Verbose datetime format for the locale default (full month, day and time)
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:94
+msgctxt "Default full date"
+msgid "%B %-e, %Y %-l:%M %P"
+msgstr "%-e %b. %Y, %-l:%M %P"
 
-#: ../../ui/composer.glade:164
-msgid "Small"
-msgstr "Маленький"
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Сейчас"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Спам"
+#: ../src/client/util/util-date.vala:167
+#, c-format
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] "%d минута назад"
+msgstr[1] "%d минуты назад"
+msgstr[2] "%d минут назад"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "Избранные"
+#: ../src/client/util/util-date.vala:171
+#, c-format
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] "%d час назад"
+msgstr[1] "%d часа назад"
+msgstr[2] "%d часов назад"
 
-#: ../../ui/login.glade:761
-msgid "Storage"
-msgstr "Хранилище"
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Вчера"
 
-#: ../../ui/composer.glade:134
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Strikethrough (Ctrl+K)"
+#. / Date format that shows the weekday (Monday, Tuesday, ...)
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:183
+#, c-format
+msgid "%A"
+msgstr "%A"
 
-#: ../../src/client/views/conversation-viewer.vala:617
-msgid "Subject:"
-msgstr "Тема:"
+#: ../src/client/util/util-email.vala:30
+#: ../src/engine/rfc822/rfc822-message.vala:781
+msgid "(no subject)"
+msgstr "(без темы)"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Тема: %s\n"
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "байт"
 
-#: ../../src/client/util/util-files.vala:19
+#: ../src/client/util/util-files.vala:19
 msgctxt "Abbreviation for terabyte"
 msgid "TB"
 msgstr "ТБ"
 
-#: ../../src/client/geary-controller.vala:1493
-#, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr ""
-"Файл уже существует в «%s».  Его замена приведет к полной перезаписи его "
-"содержимого."
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "ГБ"
 
-#: ../../src/client/geary-controller.vala:747
-msgid ""
-"The version number of the local mail database is formatted for a newer "
-"version of Geary. Unfortunately, the database cannot be \"rolled back\" to "
-"work with this version of Geary.\n"
-"\n"
-"Please install the latest version of Geary and try again."
-msgstr ""
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "МБ"
 
-#: ../../src/client/geary-controller.vala:758
-msgid ""
-"There was an error opening the local account. This is probably due to "
-"connectivity issues.\n"
-"\n"
-"Please check your network connection and restart Geary."
-msgstr ""
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "КБ"
 
-#: ../../src/client/geary-controller.vala:737
-#, c-format
-msgid ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to a file permissions problem.\n"
-"\n"
-"Please check that you have read/write permissions for all files in this "
-"directory:\n"
-"\n"
-"%s"
-msgstr ""
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../../src/client/geary-controller.vala:702
-#, c-format
+#: ../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-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
+
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
+
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "Входящие"
+
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "Черновики"
+
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "Отправленные"
+
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "Избранные"
+
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "Важное"
+
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "Вся почта"
+
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "Спам"
+
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "Корзина"
+
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "Исходящие"
+
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr "Архив"
+
+#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
+msgid "None"
+msgstr "Нет"
+
+#. Map of user-supplied search field names to column names.
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+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 match the string in Geary's help documentation.
+#. Fields we allow the token to be "me" as in from:me.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr "скрытая копия"
+
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr "тело"
+
+#. / Can be typed in the search box like cc:johndoe example com to find
+#. / messages cc'd to a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr "копия"
+
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "от"
+
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr "тема"
+
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr "кому"
+
+#. "me" can be typed like from:me or cc:me, etc. as a shorthand
+#. to find mail to or from yourself in search.  The translated
+#. string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr "я"
+
+#. List of folder names to match for Drafts, separated by |.  Please add localized common
+#. names for the Drafts folder, leaving in the English names as well.  The first in the list
+#. will be the default, so please add the most common localized name to the front.
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr "Черновики | Drafts | Draft"
+
+#. List of folder names to match for Sent Mail, separated by |.  Please add localized common
+#. names for the Sent Mail folder, leaving in the English names as well.  The first in the list
+#. will be the default, so please add the most common localized name to the front.
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr "Отправленные | Sent | Sent Mail | Sent Email | Sent E-Mail"
+
+#. List of folder names to match for Spam, separated by |.  Please add localized common
+#. names for the Spam folder, leaving in the English names as well.  The first in the list
+#. will be the default, so please add the most common localized name to the front.
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
 msgid ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to corruption of the database file in this directory:\n"
-"\n"
-"%s\n"
-"\n"
-"Geary can rebuild the database and re-synchronize with the server or exit.\n"
-"\n"
-"Rebuilding the database will destroy all local email and its attachments. "
-"<b>The mail on the your server will not be affected.</b>"
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
 msgstr ""
+"Спам | Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk "
+"Email | Bulk E-Mail"
 
-#: ../../src/client/views/conversation-viewer.vala:1147
-msgid "This link appears to go to"
-msgstr ""
+#. List of folder names to match for Trash, separated by |.  Please add localized common
+#. names for the Trash folder, leaving in the English names as well.  The first in the list
+#. will be the default, so please add the most common localized name to the front.
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr "Корзина | Trash | Rubbish | Rubbish Bin"
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "This message contains remote images."
-msgstr ""
+#. / Format for the datetime that a message being replied to was received
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/engine/rfc822/rfc822-utils.vala:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr "%A, %-e %b. %Y в %-l:%M %p"
 
-#: ../../ui/composer.glade:435
-msgid "To add them as attachments"
-msgstr "Чтобы добавить их как вложения"
+#. / The quoted header for a message being replied to.
+#. / %1$s will be substituted for the date, and %2$s will be substituted for
+#. / the original sender.
+#: ../src/engine/rfc822/rfc822-utils.vala:221
+#, c-format
+msgid "On %1$s, %2$s wrote:"
+msgstr "В %1$s, %2$s написал:"
 
-#: ../../src/client/views/conversation-viewer.vala:608
-msgid "To:"
-msgstr "Кому:"
+#. / The quoted header for a message being replied to (in case the date is not known).
+#. / %s will be replaced by the original sender.
+#: ../src/engine/rfc822/rfc822-utils.vala:228
+#, c-format
+msgid "%s wrote:"
+msgstr "%s написал:"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:220
+#. / The quoted header for a message being replied to (in case the sender is not known).
+#. / %s will be replaced by the original date
+#: ../src/engine/rfc822/rfc822-utils.vala:234
 #, c-format
-msgid "To: %s\n"
-msgstr "Кому: %s\n"
+msgid "On %s:"
+msgstr "В %s:"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "Корзина"
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Пересылаемое сообщение ----------"
 
-#: ../../src/client/geary-controller.vala:294
-msgid "U_nstar"
-msgstr "_Удалить из избранных"
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+#, c-format
+msgid "From: %s\n"
+msgstr "От: %s\n"
 
-#: ../../src/client/dialogs/password-dialog.vala:17
-msgid "Unable to login to email server"
-msgstr "Не получается авторизоваться на сервере"
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+#, c-format
+msgid "Subject: %s\n"
+msgstr "Тема: %s\n"
 
-#: ../../src/client/geary-controller.vala:736
-#: ../../src/client/geary-controller.vala:746
-#: ../../src/client/geary-controller.vala:757
+#: ../src/engine/rfc822/rfc822-utils.vala:269
 #, c-format
-msgid "Unable to open local mailbox for %s"
-msgstr ""
+msgid "Date: %s\n"
+msgstr "Дата: %s\n"
 
-#: ../../src/client/geary-controller.vala:701
+#: ../src/engine/rfc822/rfc822-utils.vala:272
 #, c-format
-msgid "Unable to open the database for %s"
-msgstr ""
+msgid "To: %s\n"
+msgstr "Кому: %s\n"
 
-#: ../../src/client/geary-controller.vala:713
+#: ../src/engine/rfc822/rfc822-utils.vala:275
 #, c-format
-msgid "Unable to rebuild database for \"%s\""
+msgid "Cc: %s\n"
+msgstr "Копия: %s\n"
+
+#: ../ui/account_cannot_remove.glade.h:1
+msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
 msgstr ""
+"<span weight=\"bold\" size=\"larger\">Невозможно удалить учётную запись</"
+"span> "
 
-#: ../../src/client/accounts/add-edit-page.vala:619
-msgid "Unable to validate:\n"
-msgstr "Невозможно подтвердить:\n"
+#: ../ui/account_cannot_remove.glade.h:2
+msgid ""
+"A composer window associated with this account is currently open. Send or "
+"discard the message and try again."
+msgstr ""
+"Открыто окно редактирования писем, связанное с данной учётной записью. "
+"Отправьте письмо или отмените его, затем попробуйте снова."
 
-#: ../../ui/composer.glade:127
-msgid "Underline (Ctrl+U)"
-msgstr "Подчеркнутый (Ctrl+U)"
+#: ../ui/account_list.glade.h:1
+msgid "Add account"
+msgstr "Добавить учётную запись"
+
+#: ../ui/account_list.glade.h:2
+msgid "Edit account"
+msgstr "Редактировать учётную запись"
+
+#: ../ui/account_list.glade.h:3
+msgid "Remove account"
+msgstr "Удалить учётную запись"
+
+#: ../ui/account_spinner.glade.h:1
+msgid "Please wait while Geary validates your account."
+msgstr "Подождите пока Geary проверит учётную запись."
+
+#: ../ui/certificate_warning_dialog.glade.h:1
+msgid "Untrusted Connection"
+msgstr "Недоверенное соединение"
+
+#: ../ui/certificate_warning_dialog.glade.h:2
+msgid "_Always Trust This Server"
+msgstr "_Всегда доверять этому серверу"
+
+#: ../ui/certificate_warning_dialog.glade.h:3
+msgid "_Trust This Server"
+msgstr "_Доверять этому серверу"
+
+#: ../ui/certificate_warning_dialog.glade.h:4
+msgid "_Don't Trust This Server"
+msgstr "_Не доверять этому серверу"
+
+#: ../ui/composer.glade.h:1
+msgid "_Undo"
+msgstr "_Отменить"
+
+#: ../ui/composer.glade.h:2
+msgid "_Redo"
+msgstr "В_ернуть"
+
+#: ../ui/composer.glade.h:3
+msgid "Cu_t"
+msgstr "_Вырезать"
+
+#: ../ui/composer.glade.h:5
+msgid "_Paste"
+msgstr "В_ставить"
+
+#: ../ui/composer.glade.h:6
+msgid "_Left"
+msgstr "По _левому краю"
+
+#: ../ui/composer.glade.h:7
+msgid "_Right"
+msgstr "По _правому краю"
+
+#: ../ui/composer.glade.h:8
+msgid "_Center"
+msgstr "По _центру"
+
+#: ../ui/composer.glade.h:9
+msgid "_Justify"
+msgstr "_Выравнивание"
+
+#: ../ui/composer.glade.h:10
+msgid "Link (Ctrl+L)"
+msgstr "Ссылка (Ctrl+L)"
+
+#: ../ui/composer.glade.h:11
+msgid "C_olor"
+msgstr "_Цвет"
 
-#: ../../ui/composer.glade:88
+#: ../ui/composer.glade.h:12
+msgid "More options"
+msgstr "Дополнительные параметры"
+
+#: ../ui/composer.glade.h:13
+msgid "Quote text  (Ctrl+])"
+msgstr "Цитировать текст (Ctrl+])"
+
+#: ../ui/composer.glade.h:14
 msgid "Unquote text (Ctrl+[)"
 msgstr "Убрать цитирование текста (Ctrl+[)"
 
-#: ../../src/client/geary-args.vala:65
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Неопознанный аргумент командной строки «%s»\n"
+#: ../ui/composer.glade.h:15
+msgid "Remove formatting (Ctrl+Space)"
+msgstr "Убрать форматирование (Ctrl+Space) "
 
-#: ../../ui/login.glade:457
-msgid "User_name:"
-msgstr "Ло_гин:"
+#: ../ui/composer.glade.h:16
+msgctxt "Clipboard paste with rich text"
+msgid "Paste _With Formatting"
+msgstr "Вставить с _форматированием"
 
-#: ../../ui/password-dialog.glade:70 ../../ui/password-dialog.glade:181
-msgid "Username:"
-msgstr "Логин:"
+#: ../ui/composer.glade.h:18
+msgid "Bold (Ctrl+B)"
+msgstr "Жирный (Ctrl+B)"
 
-#: ../../src/client/geary-application.vala:19
-msgid "Visit the Yorba web site"
-msgstr "Посетить сайт сообщества Yorba"
+#: ../ui/composer.glade.h:19
+msgid "Italic (Ctrl+I)"
+msgstr "Курсив (Ctrl+I)"
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-#, c-format
-msgid "Welcome to Geary."
-msgstr "Добро пожаловать в Geary."
+#: ../ui/composer.glade.h:20
+msgid "Underline (Ctrl+U)"
+msgstr "Подчёркнутый (Ctrl+U)"
 
-#: ../../ui/login.glade:252
-msgid "Work, Home, etc."
-msgstr "Рабочий, Домашний, и т.д."
+#: ../ui/composer.glade.h:21
+msgid "Strikethrough (Ctrl+K)"
+msgstr "Зачёркнутый (Ctrl+K)"
 
-#: ../../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#: ../ui/composer.glade.h:22
+msgid "_Rich Text"
+msgstr "Текст с оформлением"
+
+#: ../ui/composer.glade.h:23
+msgid "Show Extended Fields"
+msgstr "Показывать дополнительные поля"
+
+#: ../ui/composer.glade.h:24
+msgctxt "Label"
+msgid "Close and Save"
+msgstr "Сохранить и закрыть"
+
+#: ../ui/composer.glade.h:25
+msgctxt "Short Label"
+msgid "Close and Save"
+msgstr "Сохранить и закрыть"
+
+#: ../ui/composer.glade.h:26
+msgctxt "Tooltip"
+msgid "Close and Save"
+msgstr "Сохранить и закрыть"
+
+#: ../ui/composer.glade.h:27
+msgctxt "Label"
+msgid "Close and Discard"
+msgstr "Отказаться и закрыть"
+
+#: ../ui/composer.glade.h:28
+msgctxt "Short Label"
+msgid "Close and Discard"
+msgstr "Отказаться и закрыть"
+
+#: ../ui/composer.glade.h:29
+msgctxt "Tooltip"
+msgid "Close and Discard"
+msgstr "Отказаться и закрыть"
+
+#: ../ui/composer.glade.h:30
+msgid "Lar_ge"
+msgstr "Круп_ный"
 
-#: ../../src/client/util/util-date.vala:177
-msgid "Yesterday"
-msgstr "Вчера"
+#: ../ui/composer.glade.h:31
+msgid "Large"
+msgstr "Крупный"
 
-#: ../../src/client/geary-controller.vala:552
-msgid ""
-"Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
-"username and password could be read by another person on the network.  Are "
-"you sure you want to do this?"
-msgstr ""
-"В ваших настройках IMAP или SMTP не указано SSL или TLS шифрование. Это "
-"значит, что ваш логин и пароль может перехватить кто угодно. Вы уверены, что "
-"хотите этого?"
+#: ../ui/composer.glade.h:32
+msgid "_Medium"
+msgstr "_Средний"
 
-#: ../../src/client/geary-controller.vala:551
-msgid "Your settings are insecure"
-msgstr "Ваши настройки небезопасны"
+#: ../ui/composer.glade.h:33
+msgid "Medium"
+msgstr "Средний"
 
-#: ../../src/client/geary-controller.vala:258
-#: ../../src/client/ui/stock.vala:21
-msgid "_About"
-msgstr "_О программе"
+#: ../ui/composer.glade.h:34
+msgid "_Small"
+msgstr "_Мелкий"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:22
-msgid "_Add"
-msgstr "_Добавить"
+#: ../ui/composer.glade.h:35
+msgid "Small"
+msgstr "Мелкий"
 
-#: ../../src/client/geary-controller.vala:47
-msgid "_Archive"
-msgstr "_Архивировать"
+#: ../ui/composer.glade.h:36
+msgid "S_ans Serif"
+msgstr "_Без засечек"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "_Прикрепить"
+#: ../ui/composer.glade.h:37
+msgid "Sans Serif"
+msgstr "Без засечек"
+
+#: ../ui/composer.glade.h:38
+msgid "S_erif"
+msgstr "_С засечками"
+
+#: ../ui/composer.glade.h:39
+msgid "Serif"
+msgstr "С засечками"
+
+#: ../ui/composer.glade.h:40
+msgid "_Fixed Width"
+msgstr "_Моноширинный"
+
+#: ../ui/composer.glade.h:41
+msgid "Fixed Width"
+msgstr "Моноширинный"
 
-#: ../../ui/composer.glade:525
+#: ../ui/composer.glade.h:42
+msgid "Detach"
+msgstr "Открепить"
+
+#: ../ui/composer.glade.h:43
+#| msgid "Italic (Ctrl+I)"
+msgid "Detach (Ctrl+D)"
+msgstr "Открепить (Ctrl+D)"
+
+#: ../ui/composer.glade.h:44
+msgid "_Send"
+msgstr "_Отправить"
+
+#: ../ui/composer.glade.h:45
+msgid "Send"
+msgstr "Отправить"
+
+#: ../ui/composer.glade.h:46
+#| msgid "Bold (Ctrl+B)"
+msgid "Send (Ctrl+Enter)"
+msgstr "Отправить (Ctrl+Enter)"
+
+#: ../ui/composer.glade.h:47
 msgid "_Attach File"
 msgstr "_Вложить файл"
 
-#: ../../ui/preferences.glade:69
-msgid "_Automatically select next message"
-msgstr "_Автоматически выбирать следующее сообщение"
+#: ../ui/composer.glade.h:48
+msgid "Attach File"
+msgstr "Вложить файл"
 
-#: ../../src/client/ui/stock.vala:19
-msgid "_Cancel"
-msgstr "_Отмена"
+#: ../ui/composer.glade.h:49
+msgid "_Include Original Attachments"
+msgstr "_Включить исходные вложения"
 
-#: ../../ui/composer.glade:52
-msgid "_Center"
-msgstr "По _центру"
+#: ../ui/composer.glade.h:50
+msgid "Include Original Attachments"
+msgstr "Включить исходные вложения"
 
-#: ../../src/client/ui/stock.vala:23
-msgid "_Close"
-msgstr ""
+#: ../ui/composer.glade.h:51
+msgid "Application Menu"
+msgstr "Меню приложения"
 
-#: ../../src/client/views/conversation-viewer.vala:889
-msgid "_Copy"
-msgstr "_Копировать"
+#. Address(es) e-mail is to be sent to
+#: ../ui/composer.glade.h:53
+msgid "_To"
+msgstr "Кому"
 
-#: ../../src/client/geary-controller.vala:42
-msgid "_Delete"
-msgstr "_Удалить"
+#: ../ui/composer.glade.h:54
+msgid "_Cc"
+msgstr "Копия"
 
-#: ../../ui/password-dialog.glade:548
-msgid "_Details"
-msgstr "_Подробности"
+#: ../ui/composer.glade.h:55
+msgid "_Subject"
+msgstr "Тема"
 
-#: ../../src/client/ui/stock.vala:24
-msgid "_Discard"
-msgstr ""
+#: ../ui/composer.glade.h:56
+msgid "_Bcc"
+msgstr "Скрытая копия"
 
-#: ../../ui/preferences.glade:90
-msgid "_Display conversation preview"
-msgstr ""
+#: ../ui/composer.glade.h:57
+#| msgid "_Reply"
+msgid "_Reply-To"
+msgstr "_Ответить"
 
-#: ../../src/client/geary-controller.vala:262
-msgid "_Donate"
-msgstr ""
+#. Geary account mail will be sent from
+#: ../ui/composer.glade.h:59
+msgid "From"
+msgstr "От"
+
+#: ../ui/composer.glade.h:60
+msgid "Drop files here"
+msgstr "Перетащите файлы сюда"
 
-#: ../../ui/login.glade:782
-msgid "_Download mail:"
-msgstr "_Скачать почту"
+#: ../ui/composer.glade.h:61
+msgid "To add them as attachments"
+msgstr "чтобы добавить их как вложения"
 
-#: ../../ui/composer.glade:181
-msgid "_Fixed Width"
+#: ../ui/edit_alternate_emails.glade.h:1
+#| msgid "E_mail address"
+msgid "Remove email address"
+msgstr "Удалить адрес эл. почты"
+
+#: ../ui/edit_alternate_emails.glade.h:2
+msgid ""
+"Some email services require additional addresses be configured on the "
+"server.  Contact your email provider for more information."
 msgstr ""
+"Некоторые почтовые сервисы требуют дополнительные адреса, настроенные на "
+"сервере. Обратитесь к поставщику услуг электронной почты для получения "
+"дополнительной информации."
 
-#: ../../src/client/geary-controller.vala:328
-#: ../../src/client/views/conversation-viewer.vala:1457
-msgid "_Forward"
-msgstr "_Переслать"
+#: ../ui/edit_alternate_emails.glade.h:4
+msgid "_Update"
+msgstr "_Обновить"
 
-#: ../../src/client/geary-controller.vala:254
-#: ../../src/client/ui/stock.vala:25
-msgid "_Help"
-msgstr "_Помощь"
+#: ../ui/find_bar.glade.h:1
+msgid "Find:"
+msgstr "Найти:"
 
-#: ../../ui/composer.glade:542
-msgid "_Include Original Attachments"
-msgstr ""
+#: ../ui/find_bar.glade.h:2
+msgid "_Previous"
+msgstr "_Предыдущее"
 
-#: ../../src/client/views/conversation-viewer.vala:922
-msgid "_Inspect"
-msgstr "_Проверить"
+#: ../ui/find_bar.glade.h:3
+msgid "_Next"
+msgstr "_Следующее"
 
-#: ../../ui/composer.glade:57
-msgid "_Justify"
-msgstr "_Выравнивание"
+#: ../ui/find_bar.glade.h:4
+msgid "_Case sensitive"
+msgstr "_Учитывать регистр"
 
-#: ../../src/client/ui/stock.vala:33
-msgid "_Keep"
-msgstr ""
+#: ../ui/find_bar.glade.h:5
+msgid "label"
+msgstr "метка"
 
-#: ../../src/client/geary-controller.vala:305
-msgid "_Label"
-msgstr "_Метка"
+#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
+msgid "Password"
+msgstr "Пароль"
 
-#: ../../ui/composer.glade:42
-msgid "_Left"
-msgstr "В_лево"
+#: ../ui/login.glade.h:2
+msgid "E_mail address"
+msgstr "Адрес _эл. почты"
 
-#: ../../src/client/views/conversation-viewer.vala:1469
-msgid "_Mark as Read"
-msgstr "_Отметить как прочитанное"
+#: ../ui/login.glade.h:3
+msgid "_Password"
+msgstr "_Пароль"
 
-#: ../../src/client/views/conversation-viewer.vala:1473
-msgid "_Mark as Unread"
-msgstr "_Отметить как непрочитанное"
+#: ../ui/login.glade.h:4
+msgid "S_ervice"
+msgstr "_Сервис"
 
-#: ../../src/client/geary-controller.vala:271
-msgid "_Mark as..."
-msgstr "_Отметить как..."
+#: ../ui/login.glade.h:5
+msgid "N_ame"
+msgstr "_Имя"
 
-#: ../../ui/composer.glade:157
-msgid "_Medium"
-msgstr "_Средний"
+#: ../ui/login.glade.h:7
+msgid "N_ickname"
+msgstr "_Псевдоним"
 
-#: ../../src/client/geary-controller.vala:309
-msgid "_Move"
-msgstr "_Переместить"
+#: ../ui/login.glade.h:8
+msgid "Work, Home, etc."
+msgstr "Рабочий, Домашний, и т.д."
 
-#: ../../src/client/ui/stock.vala:18
-msgid "_OK"
-msgstr "_OK"
+#: ../ui/login.glade.h:9
+msgid "_Save sent mail"
+msgstr "_Сохранять отправленные"
 
-#: ../../src/client/ui/stock.vala:26
-msgid "_Open"
-msgstr "_Открыть"
+#: ../ui/login.glade.h:10
+msgid "Addi_tional email addresses…"
+msgstr "_Дополнительные адреса эл. почты…"
 
-#: ../../ui/login.glade:131 ../../ui/login.glade:539
-#: ../../ui/password-dialog.glade:85
-msgid "_Password:"
-msgstr "_Пароль:"
+#: ../ui/login.glade.h:11
+msgid "IMAP settings"
+msgstr "Параметры IMAP"
 
-#: ../../ui/composer.glade:35
-msgid "_Paste"
-msgstr "В_ставить"
+#: ../ui/login.glade.h:12
+msgid "Se_rver"
+msgstr "Се_рвер"
 
-#: ../../ui/preferences.glade:172
-msgid "_Play notification sounds"
-msgstr "_Проиграть звуковые уведомления"
+#: ../ui/login.glade.h:13
+msgid "P_ort"
+msgstr "П_орт"
 
-#: ../../src/client/geary-controller.vala:250
-#: ../../src/client/ui/stock.vala:27
-msgid "_Preferences"
-msgstr "_Настройки"
+#: ../ui/login.glade.h:14
+msgid "Ser_ver"
+msgstr "Сер_вер"
 
-#: ../../src/client/ui/stock.vala:28
-msgid "_Print..."
-msgstr "_Печать..."
+#: ../ui/login.glade.h:15
+msgid "Por_t"
+msgstr "По_рт"
 
-#: ../../src/client/geary-controller.vala:266
-#: ../../src/client/ui/stock.vala:29
-msgid "_Quit"
-msgstr "_Выход"
+#: ../ui/login.glade.h:16
+msgid "SMTP settings"
+msgstr "Параметры SMTP"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "_Rebuild"
-msgstr ""
+#: ../ui/login.glade.h:17
+msgid "User_name"
+msgstr "Имя _пользователя"
 
-#: ../../ui/composer.glade:14
-msgid "_Redo"
-msgstr "_Повторить"
+#: ../ui/login.glade.h:18
+msgid "Pass_word"
+msgstr "Пар_оль"
 
-#: ../../ui/password-dialog.glade:561
-msgid "_Remember passwords"
-msgstr "_Запомнить пароль"
+#: ../ui/login.glade.h:19
+msgid "SMTP username"
+msgstr "Имя пользователя SMTP"
 
-#: ../../src/client/ui/stock.vala:30
-msgid "_Remove"
-msgstr "_Удалить"
+#: ../ui/login.glade.h:20
+msgid "SMTP password"
+msgstr "Пароль SMTP"
 
-#: ../../src/client/geary-controller.vala:1496
-msgid "_Replace"
-msgstr "_Заменить"
+#: ../ui/login.glade.h:21
+msgid "_Username"
+msgstr "_Имя пользователя"
 
-#: ../../src/client/geary-controller.vala:317
-#: ../../src/client/views/conversation-viewer.vala:1447
-msgid "_Reply"
-msgstr "_Ответить"
+#: ../ui/login.glade.h:22
+msgid "IMAP username"
+msgstr "Имя пользователя IMAP"
 
-#: ../../ui/composer.glade:141
-msgid "_Rich Text"
-msgstr ""
+#: ../ui/login.glade.h:23
+msgid "IMAP password"
+msgstr "Пароль IMAP"
 
-#: ../../ui/composer.glade:47
-msgid "_Right"
-msgstr "В_право"
+#: ../ui/login.glade.h:24
+msgid "Encr_yption"
+msgstr "Ши_фрование"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:31
-msgid "_Save"
-msgstr "_Сохранить"
+#: ../ui/login.glade.h:25
+msgid "Encrypt_ion"
+msgstr "Шиф_рование"
 
-#: ../../src/client/views/conversation-viewer.vala:1395
-msgid "_Save As..."
-msgstr "_Сохранить как"
+#: ../ui/login.glade.h:27
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
 
-#: ../../src/client/views/conversation-viewer.vala:1414
-msgid "_Save Image As..."
-msgstr "_Сохранить изображение как..."
+#: ../ui/login.glade.h:28
+msgid "STARTTLS"
+msgstr "STARTTLS"
 
-#: ../../ui/composer.glade:594
-msgid "_Send"
-msgstr "_Отправить"
+#: ../ui/login.glade.h:29
+msgid "No authentication re_quired"
+msgstr "Аутентификация не требуется"
 
-#: ../../ui/composer.glade:163
-msgid "_Small"
-msgstr "_Мелкий"
+#: ../ui/login.glade.h:30
+msgid "Use IMAP cre_dentials"
+msgstr "Использовать _учётные данные IMAP"
 
-#: ../../src/client/geary-controller.vala:289
-msgid "_Star"
-msgstr "_Отметить как избранное"
+#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
+msgid "Composer"
+msgstr "Редактирование"
 
-#: ../../ui/composer.glade:7
-msgid "_Undo"
-msgstr "_Отменить"
+#: ../ui/login.glade.h:32
+msgid "Save dra_fts on server"
+msgstr "Сохранять черновики на сервере"
 
-#: ../../ui/login.glade:522
-msgid "_Username:"
-msgstr "_Логин:"
+#: ../ui/login.glade.h:33
+#| msgid "Si_gn emails:"
+msgid "Si_gn emails (HTML allowed):"
+msgstr "Подписывать письма (доступно HTML):"
 
-#: ../../src/client/views/conversation-viewer.vala:1494
-msgid "_View Source"
-msgstr "_Показать исходник"
+#: ../ui/login.glade.h:34
+msgid "Storage"
+msgstr "Хранилище"
 
-#. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
-#: ../../src/client/composer/composer-window.vala:90
-msgid "attach|enclosed|enclosing|cover letter"
-msgstr ""
+#: ../ui/login.glade.h:35
+msgid "_Download mail"
+msgstr "_Загружать почту"
 
-#: ../../src/client/views/conversation-viewer.vala:1148
-msgid "but actually goes to"
-msgstr ""
+#: ../ui/password-dialog.glade.h:1
+msgid "SMTP Credentials"
+msgstr "Учётные данные SMTP"
 
-#: ../../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "байт"
+#: ../ui/password-dialog.glade.h:2
+#| msgid "_Username"
+msgid "Username"
+msgstr "Имя пользователя"
 
-#. / Placeholder filename for attachments with no filename.
-#: ../../src/client/views/conversation-viewer.vala:1799
-#: ../../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "ничего"
+#: ../ui/password-dialog.glade.h:4
+msgid "_Remember password"
+msgstr "_Запомнить пароль"
 
-#: ../../src/client/views/conversation-find-bar.vala:226
-msgid "not found"
+#: ../ui/password-dialog.glade.h:6
+msgid "_Authenticate"
+msgstr "_Авторизоваться"
+
+#: ../ui/preferences.glade.h:1
+msgid "Reading"
+msgstr "Просмотр"
+
+#: ../ui/preferences.glade.h:2
+msgid "_Automatically select next message"
+msgstr "_Автоматически переходить к следующему сообщению"
+
+#: ../ui/preferences.glade.h:3
+msgid "_Display conversation preview"
+msgstr "_Показывать предварительный просмотр сообщений"
+
+#: ../ui/preferences.glade.h:4
+msgid "Use _three pane view"
+msgstr "Использовать _трёхпанельный интерфейс"
+
+#: ../ui/preferences.glade.h:6
+msgid "Enable _spell checking"
+msgstr "Проверять _орфографию"
+
+#: ../ui/preferences.glade.h:7
+msgid "Notifications"
+msgstr "Уведомления"
+
+#: ../ui/preferences.glade.h:8
+msgid "_Play notification sounds"
+msgstr "_Проигрывать звуковые уведомления"
+
+#: ../ui/preferences.glade.h:9
+msgid "Show _notifications for new mail"
+msgstr "_Показывать уведомления о новых сообщениях"
+
+#: ../ui/preferences.glade.h:10
+#| msgid "Show _notifications for new mail"
+msgid "Always _watch for new mail"
+msgstr "Всегда следить за поступлением новых писем"
+
+#: ../ui/preferences.glade.h:11
+msgid "Geary will run in the background and notify of new mail"
 msgstr ""
+"Geary будет работать в фоновом режиме и сообщать о поступлении новых писем"
 
-#. / Translators: add your name and email address to receive credit in the About dialog
-#. / For example: Yamada Taro <yamada taro example com>
-#: ../../src/client/geary-controller.vala:1230
-msgid "translator-credits"
+#: ../ui/preferences.glade.h:12
+msgid "Preferences"
+msgstr "Параметры"
+
+#: ../ui/remove_confirm.glade.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+"account?</span> "
 msgstr ""
-"Daniil Sobol <sobol daniil gmail com>\n"
-"Sergey V.Levin <slevin gmail com>"
+"<span weight=\"bold\" size=\"larger\">Действительно удалить эту учётную "
+"запись?</span> "
+
+#: ../ui/remove_confirm.glade.h:2
+msgid ""
+"All email associated with this account will be removed from your computer. "
+"This will not affect email on the server."
+msgstr ""
+"Все письма связанные с данной учётной записью будут удалены с компьютера. "
+"Это не повлияет на электронную почту на сервере."
+
+#: ../ui/remove_confirm.glade.h:3
+msgid "Nickname:"
+msgstr "Псевдоним:"
+
+#: ../ui/remove_confirm.glade.h:4
+msgid "Email address:"
+msgstr "Адрес эл. почты:"
+
+#: ../ui/upgrade_dialog.glade.h:1
+#| msgid "Geary upgrade in progress."
+msgid "Geary update in progress…"
+msgstr "Идёт обновление Geary…"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]