9 files changed, 25 insertions, 235 deletions
diff --git a/langpacks/english/Plugins/Alarms.txt b/langpacks/english/Plugins/Alarms.txt
index 3085511c14..0198c5f3a4 100644
--- a/langpacks/english/Plugins/Alarms.txt
+++ b/langpacks/english/Plugins/Alarms.txt
@@ -14,16 +14,16 @@
 [Use popup plugin]
 [Default snooze:]
 [minutes]
-[Row Height:]
+[Row height:]
 [Indent:]
-[Reminder Frame]
+[Reminder frame]
 [Auto hide/show]
 [Loop sound]
 [Period (hours):]
 [Hide/show with clist]
 [Auto size vertically]
 [Transparency (%):]
-[Alert Window]
+[Alert window]
 [Round corners]
 [Don't steal focus unless idle]
 [Preview]
@@ -49,25 +49,24 @@
 [Monthly]
 [Yearly]
 [i'm hiding]
-[Date and Time]
+[Date and time]
 [Disable next occurrence]
 [Don't trigger on startup]
 [No reminder]
 [Dismiss]
 [Snooze]
 [Static]
-[Reminder Frame Context]
 [&Suspend]
 [&Edit...]
 [&Delete]
 [&Options...]
-[&New Alarm...]
+[&New alarm...]
 ;file \plugins\Alarms\src\alarmlist.cpp
 ;file \plugins\Alarms\src\alarms.cpp
 [Unknown command issued: "%s"]
-[Set Alarm]
+[Set alarm]
 ;file \plugins\Alarms\src\alarm_win.cpp
-[Example Alarm]
+[Example alarm]
 [Some example text. Example, example, example.]
 [5 mins]
 [15 mins]
@@ -79,16 +78,16 @@
 [Background]
 [Window]
 ;file \plugins\Alarms\src\frame.cpp
-[Hide Reminders]
-[Show Reminders]
+[Hide reminders]
+[Show reminders]
 [Frames]
-[Alarm Reminders]
+[Alarm reminders]
 ;file \plugins\Alarms\src\icons.cpp
-[Menu: Set Alarm]
+[Menu: Set alarm]
 [Reminder: Soon]
-[Reminder: Very Soon]
-[Alarm: System Tray]
-[Menu: Show/Hide Reminders]
+[Reminder: Very soon]
+[Alarm: System tray]
+[Menu: Show/Hide reminders]
 ;file \plugins\Alarms\src\options.cpp
 [Sunday]
 [Monday]
diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt
index 8d978ce9a8..b57a832b84 100644
--- a/langpacks/english/Plugins/DbEditorPP.txt
+++ b/langpacks/english/Plugins/DbEditorPP.txt
@@ -35,6 +35,12 @@
 [OK]
 [Cancel]
 [Edit Setting]
+[Byte]
+[Word]
+[Dword]
+[String]
+[Hexadecimal]
+[Decimal]
 [Value Name:]
 [Value Data:]
 [Base]
diff --git a/langpacks/english/Plugins/Dbx_mmap_SA.txt b/langpacks/english/Plugins/Dbx_mmap_SA.txt
deleted file mode 100644
index d7ad90d6f5..0000000000
--- a/langpacks/english/Plugins/Dbx_mmap_SA.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-#muuid {28ff9b91-3e4d-4f1c-b47c-c641b037ff40}
-;============================================================
-;  File: Dbx_mmap_SA.dll
-;  Plugin: Miranda NG mmap secure database driver
-;  Version: 0.7.5.4
-;  Authors: Miranda-IM project, modification by FYR and chaos.persei, nullbie, Billy_Bons
-;============================================================
-[Provides Miranda database support: global settings, contacts, history, settings per contact. Enhanced modification with Encryption support.]
-;file \plugins\Dbx_mmap_SA\res\db3x_mmap.rc
-[Login to Miranda NG]
-[EN]
-[OK]
-[Cancel]
-[New password]
-[Change password]
-[Change]
-[Remove]
-[Old password]
-[Install Database Settings]
-[Yes]
-[No]
-[A file containing new database settings has been placed in the Miranda NG directory.]
-[Do you want to import the settings now?]
-[No to all]
-[&View contents]
-[Security systems to prevent malicious changes are in place and you will be warned before changes that are not known to be safe.]
-[Database Setting Change]
-[Database settings are being imported from]
-[This file wishes to change the setting]
-[to the value]
-[Do you want to allow this change?]
-[&Allow all further changes to this section]
-[&Yes]
-[&No]
-[Cancel Import]
-[Database Import Complete]
-[The import has completed from]
-[What do you want to do with the file now?]
-[&Recycle]
-[&Delete]
-[&Move/Rename]
-[&Leave]
-[Database encryption]
-[Info:]
-[Author:]
-[Site:]
-[Email:]
-[Unique ID:]
-;file \plugins\Dbx_mmap_SA\src\dbintf_sa.cpp
-[Your profile was decrypted to convert it into dbx_mmap format. When Miranda starts, you'll need to reenter a password]
-[Password warning]
-[Database is Secured MMAP database]
-[You are not authorized for access to Database]
-[Secured MMAP: authorization successful]
-[Database is marked as belonging to an unknown version of Miranda]
-;file \plugins\Dbx_mmap_SA\src\dialogs.cpp
-[Database Features]
-[Database]
-[Change Password]
-[Set password]
-[Dll]
-[Name]
-[Version]
-[Please type in your password for]
-[Too many errors!]
-[Password is not correct!]
-[Please enter your new password]
-[Password is too short!]
-[Passwords do not match!]
-[Wrong password!]
-;file \plugins\Dbx_mmap_SA\src\security.cpp
-[Sorry, but your database encrypted with unknown module]
-[Error]
-[Crypto modules not found]
-[DB is already secured!]
-[current database]
-[Set Password]
diff --git a/langpacks/english/Plugins/Ping.txt b/langpacks/english/Plugins/Ping.txt
index d9bba16b1e..4ae71d12c7 100644
--- a/langpacks/english/Plugins/Ping.txt
+++ b/langpacks/english/Plugins/Ping.txt
@@ -54,7 +54,7 @@
 [Options...]
 [Hosts...]
 ;file \plugins\Ping\src\menu.cpp
-[PING]
+[Ping]
 ;file \plugins\Ping\src\options.cpp
 [Open log file]
 [All\0*.*\0Text\0*.TXT\0]
@@ -81,7 +81,6 @@
 [Disable]
 [enabled]
 [double clicked]
-[Ping]
 [Show/Hide &Ping Window]
 [List]
 ;file \plugins\Ping\src\rawping.cpp
diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt
index 76e26fb49c..b2660098a1 100644
--- a/langpacks/english/Plugins/Variables.txt
+++ b/langpacks/english/Plugins/Variables.txt
@@ -109,9 +109,9 @@
 [zth contact with property y described by x, example: (unregistered,nick) (z is optional)]
 [number of contacts with property y described by x, example: (unregistered,nick)]
 [info property y of contact x]
-[db profile name]
-[db profile path]
-[db setting z of module y of contact x and return w if z isn't exist (w is optional)]
+[database profile name]
+[database profile path]
+[database setting z of module y of contact x and return w if z isn't exist (w is optional)]
 [get event for contact x (optional), according to y,z,w, see documentation]
 [get last seen time of contact x in format y (y is optional)]
 [get last seen date of contact x in format y (y is optional)]
diff --git a/langpacks/russian/Plugins/Alarms.txt b/langpacks/russian/Plugins/Alarms.txt
index 17259ea0f2..69697391c8 100644
--- a/langpacks/russian/Plugins/Alarms.txt
+++ b/langpacks/russian/Plugins/Alarms.txt
@@ -153,7 +153,7 @@
 Напоминание: очень скоро
 [Alarm: System tray]
 Трей
-[Menu: Show/Hide Reminders]
+[Menu: Show/Hide reminders]
 Меню: Показать/Скрыть напоминания
 [Sunday]
 Воскресенье
diff --git a/langpacks/russian/Plugins/Dbx_mmap_SA.txt b/langpacks/russian/Plugins/Dbx_mmap_SA.txt
deleted file mode 100644
index f14f3aa0de..0000000000
--- a/langpacks/russian/Plugins/Dbx_mmap_SA.txt
+++ /dev/null
@@ -1,133 +0,0 @@
-#muuid {28ff9b91-3e4d-4f1c-b47c-c641b037ff40}
-;============================================================
-;  File: Dbx_mmap_SA.dll
-;  Plugin: Miranda NG mmap secure database driver
-;  Version: 0.7.5.4
-;  Authors: Miranda-IM project, modification by FYR and chaos.persei, nullbie, Billy_Bons
-;============================================================
-[Provides Miranda database support: global settings, contacts, history, settings per contact. Enhanced modification with Encryption support.]
-Поддержка базы данных Miranda NG: глобальные настройки, контакты, история, настройки контактов. Расширенная модификация с поддержкой шифрования.
-[Login to Miranda NG]
-Вход в Miranda NG
-[Cancel]
-Отмена
-[New password]
-Новый пароль
-[Change password]
-Изменить пароль
-[Change]
-Изменить
-[Remove]
-Удалить
-[Old password]
-Старый пароль
-[Install Database Settings]
-Установить настройки базы данных
-[Yes]
-Да
-[No]
-Нет
-[A file containing new database settings has been placed in the Miranda NG directory.]
-Файл с новыми настройками базы данных помещён в каталог Miranda NG.
-[Do you want to import the settings now?]
-Импортировать настройки сейчас?
-[No to all]
-Нет для всех
-[&View contents]
-&Содержимое
-[Security systems to prevent malicious changes are in place and you will be warned before changes that are not known to be safe.]
-Система безопасности для предотвращения нежелательных изменений активна и вы будете предупреждены о небезопасных изменениях.
-[Database Setting Change]
-Изменение настроек базы данных
-[Database settings are being imported from]
-Настройки импортируются из
-[This file wishes to change the setting]
-Этот файл изменяет настройку
-[to the value]
-на значение
-[Do you want to allow this change?]
-Разрешить изменение?
-[&Allow all further changes to this section]
-&Разрешить все изменения в этой секции
-[&Yes]
-&Да
-[&No]
-&Нет
-[Cancel Import]
-Отменить импорт
-[Database Import Complete]
-Импорт базы завершен
-[The import has completed from]
-Импорт завершен из
-[What do you want to do with the file now?]
-Что сделать с файлом?
-[&Recycle]
-&Использовать снова
-[&Delete]
-&Удалить
-[&Move/Rename]
-&Переместить/Переименовать
-[&Leave]
-&Оставить
-[Database encryption]
-Шифрование профиля
-[Info:]
-Инфо:
-[Author:]
-Автор:
-[Site:]
-Сайт:
-[Unique ID:]
-Уник. ID:
-[Your profile was decrypted to convert it into dbx_mmap format. When Miranda starts, you'll need to reenter a password]
-Ваш профиль был расшифрован для конвертации в формат dbx_mmap. При следующем запуске программы вам потребуется заново ввести пароль из пункта в главном меню
-[Password warning]
-Предупреждение о пароле
-[Database is Secured MMAP database]
-БД: база данных с шифрованием
-[You are not authorized for access to Database]
-Вы не авторизованы для доступа к БД
-[Secured MMAP: authorization successful]
-Защищённая БД: авторизация успешна
-[Database is marked as belonging to an unknown version of Miranda]
-База данных помечена как принадлежащая неизвестной версии Miranda NG
-[Database Features]
-Возможности БД
-[Database]
-Профиль
-[Change Password]
-Сменить пароль
-[Set password]
-Установить пароль
-[Dll]
-Алгоритм
-[Name]
-Имя
-[Version]
-Версия
-[Please type in your password for]
-Пожалуйста, введите пароль для
-[Too many errors!]
-Слишком много ошибок!
-[Password is not correct!]
-Пароль неправильный!
-[Please enter your new password]
-Пожалуйста, введите новый пароль
-[Password is too short!]
-Пароль слишком короткий!
-[Passwords do not match!]
-Пароли не совпадают!
-[Wrong password!]
-Неверный пароль!
-[Sorry, but your database encrypted with unknown module]
-БД зашифрована неизвестным алгоритмом
-[Error]
-Ошибка
-[Crypto modules not found]
-Модули шифрования не найдены
-[DB is already secured!]
-Профиль уже зашифрован!
-[current database]
-текущий профиль
-[Set Password]
-Установить пароль
diff --git a/langpacks/russian/Untranslated/Dbx_mmap_SA.txt b/langpacks/russian/Untranslated/Dbx_mmap_SA.txt
deleted file mode 100644
index f059dda277..0000000000
--- a/langpacks/russian/Untranslated/Dbx_mmap_SA.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-[EN]
-[OK]
-[Email:]
diff --git a/langpacks/russian/Untranslated/SecureIM.txt b/langpacks/russian/Untranslated/SecureIM.txt
index 3042203241..0a2f31a163 100644
--- a/langpacks/russian/Untranslated/SecureIM.txt
+++ b/langpacks/russian/Untranslated/SecureIM.txt
@@ -3,6 +3,5 @@
 [SHA1:]
 [Temp Dir:]
 [OK]
-[Pre-shared key]
 [Set pre-shared key]
 [Delete pre-shared key]