- langpacks/english: update;

- langpacks/russian: update;


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

12 files changed, 16 insertions, 34 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index af86a3054d..9c72aabe85 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -653,9 +653,6 @@
 [Mmm... food.]

 [idleeeeeeee]

 [Status]

-;file \src\core\stdchat\src\clist.cpp

-[Join chat]

-[Open chat window]

 ;file \src\core\stdchat\src\colorchooser.cpp

 ;file \src\core\stdchat\src\main.cpp

 [Chat module]

@@ -1292,6 +1289,7 @@
 [Unloaded plugin]

 [Show/Hide]

 [Exit]

+[Join chat]

 [Leave chat]

 [Move to group]

 [On]

diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt
index d592032e5e..8d978ce9a8 100644
--- a/langpacks/english/Plugins/DbEditorPP.txt
+++ b/langpacks/english/Plugins/DbEditorPP.txt
@@ -128,6 +128,7 @@
 [Confirm Module Deletion]

 [Delete module from Database]

 [Delete module from Database... Loading]

+[Delete module from all contacts (Includes Setting)]

 ;file \plugins\DbEditorPP\src\exportimport.cpp

 [INI Files]

 [All Files]

diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt
index ef98726f76..bed8eca793 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -257,5 +257,3 @@
 [Squirrel]

 [Star]

 [Music]

-[Dating]

-[Mobile]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 2f995605a4..0e71804a96 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -419,7 +419,7 @@
 [month number, 01-12]

 [abbreviated month name]

 [full month name]

-[year without century, 01-  99]

+[year without century, 01-99]

 [year with century, 1901-9999]

 [abbreviated weekday name]

 [full weekday name]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 028dd22267..463e581500 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: TabSRMM.dll

 ;  Plugin: TabSRMM

-;  Version: 3.3.0.2

+;  Version: 3.3.0.3

 ;  Authors: The Miranda developers team and contributors

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

 [IM and group chat module for Miranda NG.]

@@ -87,11 +87,6 @@
 [&Add]

 [&Remove]

 ;file \plugins\TabSRMM\res\resource.rc

-[TabSRMM exception]

-[Copy to clipboard]

-[Continue]

-[Exit Miranda]

-[Although the exception was caught and you may continue working with Miranda, you should restart the program as soon as possible. The exception may have damaged internal data structures and can have a serious impact on stability.]

 [Customize the panel]

 [Scope of settings]

 [Use global or private panel height]

diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt
index 12da45360c..4107d4c3a3 100644
--- a/langpacks/russian/=CORE=.txt
+++ b/langpacks/russian/=CORE=.txt
@@ -1265,10 +1265,6 @@ Miranda NG перезапускается.\nПожалуйста, подожди
 ожидание...

 [Status]

 Статус

-[Join chat]

-Войти в чат

-[Open chat window]

-Открыть окно чата

 [Chat module]

 Модуль чата

 [Group chat log background]

@@ -2163,8 +2159,6 @@ Miranda NG не может открыть этот профиль
 Пользователи не найдены

 [Failed to create file]

 Ошибка создания файла

-[<mixed>]

-<смешано>

 [<none>]

 <нет>

 [Shadow at left]

@@ -2377,6 +2371,8 @@ ANSI плагин
 Скрыть/показать

 [Exit]

 Выход

+[Join chat]

+Войти в чат

 [Leave chat]

 Покинуть чат

 [Move to group]

diff --git a/langpacks/russian/Plugins/DbEditorPP.txt b/langpacks/russian/Plugins/DbEditorPP.txt
index a7e3d70ef6..610cafc635 100644
--- a/langpacks/russian/Plugins/DbEditorPP.txt
+++ b/langpacks/russian/Plugins/DbEditorPP.txt
@@ -241,6 +241,8 @@ BL&OB
 Удалить модуль из базы

 [Delete module from Database... Loading]

 Удаление модуля из базы... Загрузка

+[Delete module from all contacts (Includes Setting)]

+Удалить из всех контактов (с настройками)

 [INI Files]

 INI файлы

 [All Files]

diff --git a/langpacks/russian/Plugins/HistoryPP.txt b/langpacks/russian/Plugins/HistoryPP.txt
index e76e58f2a0..b16bc9c75d 100644
--- a/langpacks/russian/Plugins/HistoryPP.txt
+++ b/langpacks/russian/Plugins/HistoryPP.txt
@@ -719,5 +719,3 @@ Wiki-страница дополнительных параметров
 История сообщений

 [View &History]

 &История

-[User Menu]

-Меню пользователя
\ No newline at end of file
diff --git a/langpacks/russian/Plugins/MRA.txt b/langpacks/russian/Plugins/MRA.txt
index d3b701172f..336f1962ad 100644
--- a/langpacks/russian/Plugins/MRA.txt
+++ b/langpacks/russian/Plugins/MRA.txt
@@ -479,7 +479,3 @@ MRIM_CS_SMS_ACK: не найден в очереди
 Звезда

 [Music]

 Музыка

-[Dating]

-Встреча

-[Mobile]

-Мобильный

diff --git a/langpacks/russian/Plugins/TabSRMM.txt b/langpacks/russian/Plugins/TabSRMM.txt
index de5efc3949..af447e3ea6 100644
--- a/langpacks/russian/Plugins/TabSRMM.txt
+++ b/langpacks/russian/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: TabSRMM.dll

 ;  Plugin: TabSRMM

-;  Version: 3.3.0.2

+;  Version: 3.3.0.3

 ;  Authors: The Miranda developers team and contributors

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

 [IM and group chat module for Miranda NG.]

@@ -159,14 +159,6 @@
 &Добавить

 [&Remove]

 &Очистить

-[TabSRMM exception]

-Ошибка TabSRMM

-[Copy to clipboard]

-Копировать в буфер обмена

-[Continue]

-Продолжить

-[Exit Miranda]

-Выход из Miranda

 [Customize the panel]

 Настроить инфо-панель

 [Scope of settings]

diff --git a/langpacks/russian/Plugins/_Various.txt b/langpacks/russian/Plugins/_Various.txt
index cf4dc70e5f..17d75db54c 100644
--- a/langpacks/russian/Plugins/_Various.txt
+++ b/langpacks/russian/Plugins/_Various.txt
@@ -7,6 +7,13 @@
 [<mixed>]

 <различные>

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

+;  DbEditorPP

+;==============================================================================

+[Decimal]

+Десятичная

+[Dword]

+Двойное слово

+;==============================================================================

 ;  Popup

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

 [Flat borders]

diff --git a/langpacks/russian/Untranslated/TabSRMM.txt b/langpacks/russian/Untranslated/TabSRMM.txt
index a32750575e..1cdb8b4ae6 100644
--- a/langpacks/russian/Untranslated/TabSRMM.txt
+++ b/langpacks/russian/Untranslated/TabSRMM.txt
@@ -1,6 +1,5 @@
 [OK]

 [Google]

-[Although the exception was caught and you may continue working with Miranda, you should restart the program as soon as possible. The exception may have damaged internal data structures and can have a serious impact on stability.]

 [A send later job failed to complete.\nThe original message: %s]

 [Removed]

 [Sent OK]