13 files changed, 47 insertions, 45 deletions
diff --git a/langpacks/russian/Plugins/NewAwaySys.txt b/langpacks/russian/Plugins/NewAwaySys.txt
index df74e04bd5..fa60c22724 100644
--- a/langpacks/russian/Plugins/NewAwaySys.txt
+++ b/langpacks/russian/Plugins/NewAwaySys.txt
@@ -3,7 +3,7 @@
 ;  File: NewAwaySys.dll
 ;  Plugin: New Away System Mod
 ;  Version: 0.4.0.1
-;  Authors: NightFox; Deathdemon; XF007; Goblineye Entertainment
+;  Authors: NightFox, Deathdemon, XF007, Goblineye Entertainment
 ;============================================================
 [New Away System Mod plugin for Miranda NG.]
 Плагин New Away System Mod для Miranda NG. 
@@ -29,8 +29,6 @@
 0=Умолчание
 [-1 = Infinite]
 -1=Бесконечно
-[Colours]
-Цвета
 [Background]
 Фон
 [Use default]
@@ -73,15 +71,15 @@
 Посылать макс.
 [times (-1=infinite)]
 раз (-1=бесконечно)
-[Reset this counter also when i just change my status text\n(when status icon remains the same)]
+[Reset this counter also when I just change my status text\n(when status icon remains the same)]
 Сбросить этот счётчик после смены статусного сообщения (но не статуса)
 [Disable autoreply when...]
 Отключить автоответчик когда...
 [&Invisible]
 &Невидимый
-[On the &Phone]
+[On the &phone]
 На телефоне
-[Out to &Lunch]
+[Out to &lunch]
 Обедаю
 [Autoreply format:]
 Формат автоответа:
@@ -95,9 +93,9 @@
 Автоответчик
 [&Delete]
 &Удалить
-[New &Category]
+[New &category]
 Новая категория
-[Save As &New]
+[Save as &new]
 Сохранить &как
 [&Save]
 &Сохранить
@@ -143,7 +141,7 @@
 секунд(ы)
 [Don't show the message dialog for]
 Не показывать диалог выбора для
-[%s Message for %s]
+[%s message for %s]
 %s (%s)
 [Retrieving %s message...]
 Загрузка сообщения "%s"...
@@ -195,8 +193,6 @@
 Вы можете разместить часто используемые и любимые сообщения в этой категории.
 [Windows]
 Windows
-[When this checkbox is ticked, NewAwaySys counts "send times" starting from the last status message change, even if status mode didn't change.\nWhen the checkbox isn't ticked, "send times" are counted from last status mode change (i.e. disabled state is more restrictive).]
-Когда эта галочка установлена, плагин NewAwaySys считает количество отправок начиная с последнего изменения сообщения статуса, даже если статус не менялся.\nКогда не установлена, количество отправок считается с последнего изменения статуса (выключенное состояние более ограничено).
 [Message]
 Сообщение
 [URL]
@@ -235,7 +231,7 @@ Windows
 Ушел с %nas_awaysince_time%, буду позже.
 [NA]
 Недоступен
-[Give it up, i'm not in!]
+[Give it up, I'm not in!]
 Ну нет меня сейчас, нет...
 [Occupied]
 Занят
@@ -247,15 +243,15 @@ Windows
 Прошу не тревожить...
 [Free for chat]
 Готов болтать
-[i'm a chatbot!]
+[I'm a chatbot!]
 Свободен.
 [Invisible]
 Невидимый
-[i'm hiding from the mafia.]
+[I'm hiding from the mafia.]
 Я прячусь от мафии.
 [On the phone]
 На телефоне
-[i've been on the phone since %nas_awaysince_time%, give me a sec!]
+[I've been on the phone since %nas_awaysince_time%, give me a sec!]
 Разговариваю по телефону с %nas_awaysince_time%, подождите немного!
 [Out to lunch]
 Обедаю
@@ -271,7 +267,7 @@ Windows
  сообщение:\r\n
 [Set %s message for the contact]
 Уст. %s сообщение для контакта
-[Re&ad %s Message]
+[Re&ad %s message]
 &Прочитать сообщение "%s"
 [Toggle autoreply on/off]
 Автоответчик вкл/выкл 
@@ -299,20 +295,6 @@ Windows
 %d мин.
 [%d seconds]
 %d сек.
-[New Away System\tStatus description]
-Система сообщений\tОписание статуса
-[New Away System\tYour nick for current protocol]
-Система сообщений\tВаш ник для текущего протокола
-[New Away System\tNumber of status message requests from the contact]
-Система сообщений\tНомер запроса статусного сообщения от контакта
-[New Away System\tNumber of messages from the contact]
-Система сообщений\tНомер сообщения от контакта
-[New Away System\tTime passed until request]
-Система сообщений\tВремя до следующего запроса
-[New Away System\t(x)\tReturns one of your predefined messages by its title: ?nas_predefinedmessage(creepy)]
-Система сообщений\t(x)\tВозвращает одно из ваших установленых сообщений по заголовку: ?nas_predefinedmessage(creepy)
-[New Away System\tCurrent protocol name]
-Система сообщений\tТекущее имя протокола
 [Read status message]
 Читать статусное сообщение
 [Set status message]
@@ -337,9 +319,9 @@ NewAwaySys: Входящий запрос статусного сообщени�
 Всплывающие окна
 [Variables plugin is not installed]
 Плагин Variables неустановлен
-[You've made changes to multiple Message trees at a time.\r\nDo you want to leave changes in "]
+[You've made changes to multiple message trees at a time.\r\nDo you want to leave changes in "]
 Вы изменили несколько деревьев сразу.\r\nХотите сохранить изменения в "
-[" dialog?\r\nPress Yes to leave changes in this dialog, or No to discard its changes and save changes of the other Message tree instead.]
+[" dialog?\r\nPress Yes to leave changes in this dialog, or No to discard its changes and save changes of the other message tree instead.]
 " диалог?\r\b\n"Да" для сохранения, "Нет" для отмены изменений.
 [Error #%d]
 Ошибка #%d
diff --git a/langpacks/russian/Plugins/Tipper.txt b/langpacks/russian/Plugins/Tipper.txt
index 3dc4121b6f..4c0c56b0e8 100644
--- a/langpacks/russian/Plugins/Tipper.txt
+++ b/langpacks/russian/Plugins/Tipper.txt
@@ -445,6 +445,12 @@ IP
 Ветер:
 [# Solid color fill]
 \# Заливка цветом
+[%dd %dh %dm]
+%dдн %dчас %dмин
+[%dh %dm]
+%dчас %dмин
+[%dm]
+%dмин
 [Background]
 Фон
 [Dividers]
diff --git a/langpacks/russian/Plugins/_Various.txt b/langpacks/russian/Plugins/_Various.txt
index cf4dc70e5f..d5da8bd214 100644
--- a/langpacks/russian/Plugins/_Various.txt
+++ b/langpacks/russian/Plugins/_Various.txt
@@ -24,15 +24,6 @@
 [Warning (colors only)]
 Предупреждение (только цвета)
 ;==============================================================================
-;  Tipper
-;==============================================================================
-[%dd %dh %dm]
-%dдн %dчас %dмин
-[%dh %dm]
-%dчас %dмин
-[%dm]
-%dмин
-;==============================================================================
 ;  Various actions and tipper items not included in source code.
 ;==============================================================================
 [Last seen:]
diff --git a/langpacks/russian/Untranslated/=CORE=.txt b/langpacks/russian/Untranslated/=CORE=.txt
index a224c65ed5..eae0c3cc3d 100644
--- a/langpacks/russian/Untranslated/=CORE=.txt
+++ b/langpacks/russian/Untranslated/=CORE=.txt
@@ -7,6 +7,7 @@
 [Miranda NG\n%s]
 [Windows]
 [Miranda]
+[%s\t%s]
 [E-mail]
 [Ctrl + ]
 [Alt + ]
diff --git a/langpacks/russian/Untranslated/Alarms.txt b/langpacks/russian/Untranslated/Alarms.txt
index b4fe5ddb5e..acf67919df 100644
--- a/langpacks/russian/Untranslated/Alarms.txt
+++ b/langpacks/russian/Untranslated/Alarms.txt
@@ -1,2 +1,4 @@
 [OK]
 [Unknown command issued: "%s"]
+[%dh %dm]
+[%dm]
diff --git a/langpacks/russian/Untranslated/AssocMgr.txt b/langpacks/russian/Untranslated/AssocMgr.txt
index 3db2215482..f10e6f0282 100644
--- a/langpacks/russian/Untranslated/AssocMgr.txt
+++ b/langpacks/russian/Untranslated/AssocMgr.txt
@@ -1,3 +1,4 @@
-[Miranda NG was not able to open "%S".\n\nThere is no registered handler for this file type.]
+[%hs:]
+[Miranda NG was not able to open "%S".\n\nThere is no registered handler for this file type.]
 [Miranda NG was not able to open "%S".\n\nThe file could not be processed.]
 [Miranda NG was not able to open "%S".\n\nThere is no registered handler for this URL type.]
diff --git a/langpacks/russian/Untranslated/BasicHistory.txt b/langpacks/russian/Untranslated/BasicHistory.txt
index 895f0f90c2..82cdbae1d0 100644
--- a/langpacks/russian/Untranslated/BasicHistory.txt
+++ b/langpacks/russian/Untranslated/BasicHistory.txt
@@ -1,6 +1,7 @@
 [OK]
 [Execute history task]
 [%s Files (*.%s)]
+[*.%s]
 [File does not contain selected contact]
 [File is corrupted]
 [Do you want to delete all imported messages for this contact?\nNote that next scheduler task import this messages again.]
diff --git a/langpacks/russian/Untranslated/Clist_modern.txt b/langpacks/russian/Untranslated/Clist_modern.txt
index fa7e07d591..d2825e7105 100644
--- a/langpacks/russian/Untranslated/Clist_modern.txt
+++ b/langpacks/russian/Untranslated/Clist_modern.txt
@@ -1,5 +1,6 @@
 [OK]
 [UNDER CONSTRUCTION!!!           IT DOES NOT WORK]
+[%s]
 [ layered]
 [( unknown )]
 [reVista for Modern v0.5]
diff --git a/langpacks/russian/Untranslated/CmdLine.txt b/langpacks/russian/Untranslated/CmdLine.txt
index 9ceba84616..ba53ade3ea 100644
--- a/langpacks/russian/Untranslated/CmdLine.txt
+++ b/langpacks/russian/Untranslated/CmdLine.txt
@@ -7,5 +7,6 @@
 [Failed to change status message for account '%s' to '%s' (status is '%s').]
 [CallService call successful: service '%s' returned %p.]
 [Message to '%s' was marked as sent but the account seems to be offline]
+['%s/%s' - %s.]
 [[me]]
 [Error setting nickname to '%s' for protocol '%s']
diff --git a/langpacks/russian/Untranslated/LangMan.txt b/langpacks/russian/Untranslated/LangMan.txt
new file mode 100644
index 0000000000..b8f97898eb
--- /dev/null
+++ b/langpacks/russian/Untranslated/LangMan.txt
@@ -0,0 +1 @@
+[%hs (%s)]
diff --git a/langpacks/russian/Untranslated/NewAwaySys.txt b/langpacks/russian/Untranslated/NewAwaySys.txt
index 7a5c6ccfdc..9d81bac66b 100644
--- a/langpacks/russian/Untranslated/NewAwaySys.txt
+++ b/langpacks/russian/Untranslated/NewAwaySys.txt
@@ -1,13 +1,24 @@
 [V]
+[Colors]
 [OK]
 [Statuses messages:]
 [Configure autoaway]
 [Store for each status separately]
 [Use default...]
 [Miranda]
+[When this checkbox is ticked, NewAwaySys counts "send times" starting from the last status message change, even if status mode didn't change.\nWhen the checkbox isn't ticked, "send times" are counted from last status mode change (i.e., disabled state is more restrictive).]
 [Statuses messages]
-[New Away System\t(x)\tAway since time in default format; ?nas_awaysince_time(x) in format x]
-[New Away System\t(x)\tAway since date in default format; ?nas_awaysince_date(x) in format x]
+[Been fragging since %nas_awaysince_time%, i'll msg you later when the adrenaline wears off.]
+[Away since time in default format; ?nas_awaysince_time(x) in format x]
+[Away since date in default format; ?nas_awaysince_date(x) in format x]
+[Status description]
+[Your nick for current protocol]
+[Number of status message requests from the contact]
+[Number of messages from the contact]
+[Time passed until request]
+[Returns one of your predefined messages by its title: ?nas_predefinedmessage(creepy)]
+[Current protocol name]
+[`[`!cdate()-!ctime()`]`  ?cinfo(%subject%,display) (?cinfo(%subject%,id)) read your %nas_statdesc% message:\r\n%extratext%\r\n\r\n]
 [Do you really want to delete this category with its messages?]
 [Do you really want to delete this message?]
 [Set message for]
diff --git a/langpacks/russian/Untranslated/Tipper.txt b/langpacks/russian/Untranslated/Tipper.txt
index f9d34c9e1a..09e04ca2bb 100644
--- a/langpacks/russian/Untranslated/Tipper.txt
+++ b/langpacks/russian/Untranslated/Tipper.txt
@@ -2,3 +2,5 @@
 [%s ago]
 [Email:]
 [IP:]
+[%dy %dd %dh %dm]
+[%dd]
diff --git a/langpacks/russian/Untranslated/Weather.txt b/langpacks/russian/Untranslated/Weather.txt
index 030a1f65c1..c2855f7cb4 100644
--- a/langpacks/russian/Untranslated/Weather.txt
+++ b/langpacks/russian/Untranslated/Weather.txt
@@ -1,2 +1,4 @@
-[Temperature: %[Temperature]]
+[%n  [%t, %c]]
+[%n   (%u)]
+[Temperature: %[Temperature]]
 [No update data file is found. Please check your Plugins\\Weather directory.]