- langpacks/english: update;

- langpacks/russian: update;


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

5 files changed, 4 insertions, 12 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]