5 files changed, 66 insertions, 34 deletions
diff --git a/langpacks/russian/Plugins/CmdLine.txt b/langpacks/russian/Plugins/CmdLine.txt
index 3be93a76aa..8c81d12538 100644
--- a/langpacks/russian/Plugins/CmdLine.txt
+++ b/langpacks/russian/Plugins/CmdLine.txt
@@ -65,8 +65,6 @@ Miranda была закрыта или произошла ошибка при о
 Меняет ник пользователя на указанном протоколе.\nИспользование: setnickname <протокол> новый_ник.
 [Ignores or removes ignore flags for specific contacts.\nUsage:\n  ignore (block | unblock) <contact> [<contact> [<contact> [...]]].\nThe command will set or remove ignore flags for the specified contacts]
 Включение и отключение флага "игнорировать" для указанных контактов.\nИспользование:\n  ignore (block | unblock) <контакт> [<контакт> [<контакт> [...]]].\nКоманда переключит (установит или удалит) игнорирование для указанных контактов.
-[Command '%s' is not currently supported.]
-Команда '%s' не поддерживается.
 [Wrong number of parameters for command '%s'.]
 Неверное количество параметров для команды '%s'
 [Unknown parameter '%s' for command '%s'.]
@@ -125,6 +123,8 @@ Miranda была закрыта или произошла ошибка при о
 %s:%s - %d непрочитанные сообщения.
 [Contact '%s' has %d events in history.]
 Контакт '%s' имеет %d событий в истории.
+[Command '%s' is not currently supported.]
+Команда '%s' не поддерживается.
 [Could not create CommandLine listening server!]
 Невозможно создать сервер CommandLine!
 [You can only run one instance of CmdLine plugin.]
diff --git a/langpacks/russian/Plugins/DbEditorPP.txt b/langpacks/russian/Plugins/DbEditorPP.txt
index 418b9a6f80..5acb5b9b65 100644
--- a/langpacks/russian/Plugins/DbEditorPP.txt
+++ b/langpacks/russian/Plugins/DbEditorPP.txt
@@ -9,6 +9,12 @@
 Расширенный редактор базы.
 [Database Editor++ search and replace]
 Найти и заменить
+[Search for]
+Искать
+[Text:]
+Текст:
+[In:]
+В:
 [Case sensitive]
 Учёт регистра
 [Module name]
@@ -21,22 +27,16 @@
 Значение
 [&Search]
 &Искать
+[Replace with]
+Заменить на
+[Entirely]
+Полностью
 [Found field]
 Найдено поле
 [&Replace]
 &Заменить
 [&Cancel]
 О&тмена
-[Search for]
-Искать
-[Text:]
-Текст:
-[In:]
-В:
-[Replace with]
-Заменить на
-[Entirely]
-Полностью
 [Restore last opened position]
 Восстановить последнее положение
 [Automatically expand "Settings" when Database Editor++ starts]
@@ -59,42 +59,42 @@
 Отмена
 [Edit setting]
 Редактировать настройку
-[Byte]
-Байт
-[Word]
-Слово
-[Dword]
-Дв.слово
-[String]
-Строка
-[Hexadecimal]
-Шестнадц.
-[Decimal]
-Десятичное
 [Value name:]
 Имя:
 [Value data:]
 Значение:
 [Base]
 Основание
+[Hexadecimal]
+Шестнадц.
+[Decimal]
+Десятичное
 [Save value as:]
 Сохранить как:
+[Byte]
+Байт
+[Word]
+Слово
+[Dword]
+Дв.слово
+[String]
+Строка
 [Watched database settings]
 Настройки под наблюдением
 [Copy module to contact]
 Копировать модуль в контакт
-[Copy to all contacts (including Settings)]
-Во все контакты (и общие настройки)
 [Contact to copy module and settings to]
 Копировать модуль и настройки в
+[Copy to all contacts (including Settings)]
+Во все контакты (и общие настройки)
 [Import module/settings]
 Импортировать модуль/настройки
+[Paste the settings to import here.]
+Вставьте настройки сюда.
 [Import]
 Импорт
 [Insert &CR/LF]
 Вставить &CR/LF
-[Paste the settings to import here.]
-Вставьте настройки сюда.
 [Database Editor++]
 Редактор базы
 [&Main]
diff --git a/langpacks/russian/Plugins/New_GPG.txt b/langpacks/russian/Plugins/New_GPG.txt
index 64eddb1d04..06d5c73225 100644
--- a/langpacks/russian/Plugins/New_GPG.txt
+++ b/langpacks/russian/Plugins/New_GPG.txt
@@ -203,5 +203,3 @@ ID ключа:
 Вы хотите убрать ключ для метаконтакта (всех субконтактов)?
 [LOG files]
 Файлы журнала
-[and]
-и
diff --git a/langpacks/russian/Untranslated/CmdLine.txt b/langpacks/russian/Untranslated/CmdLine.txt
index 9ceba84616..edb154db26 100644
--- a/langpacks/russian/Untranslated/CmdLine.txt
+++ b/langpacks/russian/Untranslated/CmdLine.txt
@@ -5,7 +5,36 @@
 [Account '%S' does not support away messages, skipping.]
 [Account '%s' does not support away messages, skipping.]
 [Failed to change status message for account '%s' to '%s' (status is '%s').]
+[Popups are currently enabled.]
+[Popups are currently disabled.]
+[Popups were enabled successfully.]
+[Popups could not be enabled.]
+[Popups were disabled successfully.]
+[Popups could not be disabled.]
+[Sounds are currently enabled.]
+[Sounds are currently disabled.]
+[Sounds were enabled successfully.]
+[Sounds were disabled successfully.]
+[Contact list is currectly shown.]
+[Contact list is currently hidden.]
+[Contact list was shown successfully.]
+[Contact list was hidden successfully.]
+[Issued a quit command.]
+[Issued a quit and wait command.]
 [CallService call successful: service '%s' returned %p.]
 [Message to '%s' was marked as sent but the account seems to be offline]
+[byte:%d]
+[word:%d]
+[dword:%ld]
+[string:'%s']
+[wide string:'%S']
+[utf8:'%s']
+[blob:N/A]
+[unknown value]
+[string]
+[byte]
+[word]
+[dword]
+[wide string]
 [[me]]
 [Error setting nickname to '%s' for protocol '%s']
diff --git a/langpacks/russian/Untranslated/New_GPG.txt b/langpacks/russian/Untranslated/New_GPG.txt
index 4e2cd9c19b..8f31999e45 100644
--- a/langpacks/russian/Untranslated/New_GPG.txt
+++ b/langpacks/russian/Untranslated/New_GPG.txt
@@ -23,11 +23,13 @@
 [Expire date]
 [Generating new random key, please wait]
 [Failed to allocate memory]
+[Failed to lock memory with error %d]
+[Failed write to clipboard with error %d]
 [GPG binary found in Miranda folder, but English locale does not exist.\nIt's highly recommended to place \\gnupg.nls\\en@quot.mo in GnuPG folder under Miranda root.\nWithout this file you may experience many problems with GPG output on non-English systems\nand plugin may completely not work.\nYou have been warned.]
 [Wrong GPG binary location found in system.\nPlease choose another location]
 ["GPG" directory found in Miranda root.\nAssuming it's GPG home directory.\nGPG home directory set.]
 [GPG binary does not exist.\nPlease choose another location]
-[Received key from ]
+[Received key from %s]
 [You must set encryption algorithm first]
 [Key length must be of length from 1024 to 4096 bits]
 [Invalid date]
@@ -62,6 +64,7 @@
 [Key removed from GPG keyring]
 [Export public key]
 [.asc pubkey file]
+[Failed to open clipboard with error %d]
 [Set log file]
 [Choose gpg.exe]
 [Set home directory]
@@ -81,10 +84,12 @@
 [File transfer warning]
 [Unable to check encryption support on other side.\nRecipient may be unable to decrypt file(s).\nCurrently capability check supported only for ICQ and Jabber protocols.\nIt will work for any other proto if Miranda with New_GPG is used on other side.\nDo you want to encrypt file(s) anyway?]
 [encrypting file for transfer]
-[we have successfully exported]
-[public keys]
-[all private keys]
+[We have successfully exported %d public keys and all private keys.]
+[We have successfully exported all private keys.]
+[We have successfully exported %d public keys.]
 [Keys export result]
+[We have successfully processed %d public keys and some private keys.]
+[We have successfully processed %d public keys.]
 [Keys import result]
 [New passwords do not match]
 [Old password does not match, you can continue, but GPG will reject wrong password.\nDo you want to continue?]