- langpacks/english: update;

- langpacks/russian: update;


git-svn-id: http://svn.miranda-ng.org/main/trunk@8128 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

7 files changed, 12 insertions, 10 deletions

diff --git a/langpacks/english/Plugins/Dbx_mmap.txt b/langpacks/english/Plugins/Dbx_mmap.txt
index 473c89235d..d1b76aa980 100644
--- a/langpacks/english/Plugins/Dbx_mmap.txt
+++ b/langpacks/english/Plugins/Dbx_mmap.txt
@@ -23,6 +23,7 @@
 [Total]

 [Only critical data are encrypted (passwords, security tokens, etc). All another settings and history remains unencrypted. Fast and effective, suitable for the most cases]

 [All string settings and all events in histories are encrypted. It also makes Miranda much slower and creates a risk of losing everything you've stored in a profile in case of losing password. Recommended only for paranoidal users]

+[Set password]

 ;file \plugins\Db3x_mmap\src\database.cpp

 [Disk is full. Miranda will now shut down.]

 [Database failure. Miranda will now shut down.]

@@ -31,7 +32,6 @@
 [Database Panic]

 ;file \plugins\Db3x_mmap\src\dbintf.h

 [Change/remove password]

-[Set password]

 ;file \plugins\Db3x_mmap\src\ui.cpp

 [Logo]

 [Password]

diff --git a/langpacks/english/Plugins/GTalkExt.txt b/langpacks/english/Plugins/GTalkExt.txt
index 1eb6f173b7..3bc5418916 100644
--- a/langpacks/english/Plugins/GTalkExt.txt
+++ b/langpacks/english/Plugins/GTalkExt.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: GTalkExt.dll

 ;  Plugin: GTalk Extension

-;  Version: 0.1.0.2

+;  Version: 0.1.1.0

 ;  Authors: bems

 ;============================================================

 [GTalk extensions for Jabber protocol]

diff --git a/langpacks/english/Plugins/Spamotron.txt b/langpacks/english/Plugins/Spamotron.txt
index 6e354584e7..cf8b243cf7 100644
--- a/langpacks/english/Plugins/Spamotron.txt
+++ b/langpacks/english/Plugins/Spamotron.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Spamotron.dll

 ;  Plugin: Spam-o-tron

-;  Version: 0.0.4.6

+;  Version: 0.0.4.7

 ;  Authors: vu1tur

 ;============================================================

 [Anti-spam plugin with captcha and Bayes filtering.]

@@ -52,7 +52,7 @@
 [Appearance]

 [Foreground]

 [Background]

-[Timeout]

+[Timeout (sec)]

 [Contact blocked]

 [Contact approved]

 [Challenge sent]

@@ -76,13 +76,13 @@
 [Will be automatically evaluated from %mathexpr%]

 [Invalid regular expression.\nKeeping previous value.]

 [Message score]

-[Message Sessions]

+[Message sessions]

 [Messages]

 [Bayes]

 [Popups]

 ;file \plugins\Spamotron\src\popups.cpp

 [Message blocked due to preview action]

-[Message approved due to preview action]

+[Contact approved due to preview action]

 [Challenge sent to preview contact]

 ;file \plugins\Spamotron\src\spamotron.cpp

 [Contact %s approved.]

diff --git a/langpacks/russian/Plugins/Actman.txt b/langpacks/russian/Plugins/Actman.txt
index 95176ef334..51130edfbf 100644
--- a/langpacks/russian/Plugins/Actman.txt
+++ b/langpacks/russian/Plugins/Actman.txt
@@ -561,6 +561,7 @@ UTF16+сигнатура
 Упакованная структура

 [Registered actions]

 Зарегистрированные действия

+; Actman30

 [INI]

 Файл INI

 [INI file name]

@@ -697,6 +698,7 @@ UTF16+сигнатура
 список контактов

 [database driver]

 драйвер базы

+; these lines are not present in the sources, but they are present in compiled plugin

 [Text Editor]

 Текстовый редактор

 [Script]

diff --git a/langpacks/russian/Plugins/Dbx_mmap.txt b/langpacks/russian/Plugins/Dbx_mmap.txt
index ec6be59349..a6dda970d9 100644
--- a/langpacks/russian/Plugins/Dbx_mmap.txt
+++ b/langpacks/russian/Plugins/Dbx_mmap.txt
@@ -35,6 +35,8 @@
 Шифрование только критических данных (пароли, токены авторизации и т.д.). Остальные настройки, включая историю, остаются незашифрованными. Быстрый и эффективный, подходит в большинстве случаев

 [All string settings and all events in histories are encrypted. It also makes Miranda much slower and creates a risk of losing everything you've stored in a profile in case of losing password. Recommended only for paranoidal users]

 Все настройки и все события истории зашифрованы. Замедляет работу программы, а также создаёт риск потери всего сохранённого в профиле в случае утери пароля. Рекомендуется только параноидальным пользователям

+[Set password]

+Установить пароль

 [Disk is full. Miranda will now shut down.]

 Диск полон. Miranda завершает работу.

 [Database failure. Miranda will now shut down.]

@@ -47,8 +49,6 @@ Miranda нашла повреждения в Вашей базе. Они мог�
 Проблема с базой

 [Change/remove password]

 Изменить/удалить пароль

-[Set password]

-Установить пароль

 [Password]

 Пароль

 [Too many errors!]

diff --git a/langpacks/russian/Plugins/GTalkExt.txt b/langpacks/russian/Plugins/GTalkExt.txt
index af835625c6..a00bdd6c27 100644
--- a/langpacks/russian/Plugins/GTalkExt.txt
+++ b/langpacks/russian/Plugins/GTalkExt.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: GTalkExt.dll

 ;  Plugin: GTalk Extension

-;  Version: 0.1.0.2

+;  Version: 0.1.1.0

 ;  Authors: bems

 ;============================================================

 [GTalk extensions for Jabber protocol]

diff --git a/langpacks/russian/Plugins/Spamotron.txt b/langpacks/russian/Plugins/Spamotron.txt
index aa878c1953..896599071c 100644
--- a/langpacks/russian/Plugins/Spamotron.txt
+++ b/langpacks/russian/Plugins/Spamotron.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Spamotron.dll

 ;  Plugin: Spam-o-tron

-;  Version: 0.0.4.6

+;  Version: 0.0.4.7

 ;  Authors: vu1tur

 ;============================================================

 [Anti-spam plugin with captcha and Bayes filtering.]