- langpacks/english: update;

- langpacks/russian: update;


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

5 files changed, 13 insertions, 4 deletions

diff --git a/langpacks/english/Plugins/Folders.txt b/langpacks/english/Plugins/Folders.txt
index 2de9731ca0..c3016f3681 100644
--- a/langpacks/english/Plugins/Folders.txt
+++ b/langpacks/english/Plugins/Folders.txt
@@ -29,7 +29,7 @@
 [(e.g., default if your your profile is default.dat).]

 [Environment variables]

 [The plugin can also expand environment variables; the variables are specified like in any other]

-[program that can use environment variables, i.e. %<env variable>%.]

+[program that can use environment variables, i.e., %<env variable>%.]

 [Note: Environment variables are expanded before any Miranda variables. So if you have, for]

 [example, %profile_path% defined as a system variable then it will be expanded to that value]

 [instead of expanding to Miranda's profile path.]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 84628365dd..7c16c00221 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -56,7 +56,7 @@
 [Never use legacy messaging (server acknowledgements)]

 [Peer-to-peer Messaging]

 [Enable peer-to-peer message connections]

-[Passive mode, i.e. do not initiate new connections]

+[Passive mode (i.e., do not initiate new connections)]

 [Extra Features]

 [Enable Custom status support for xtraz]

 [Enable Custom status support for moods]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index d80e0cab3d..7fd057c342 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -949,6 +949,7 @@
 [Privacy list %s set as default]

 [Default privacy list successfully declined]

 [Error occurred while setting default list]

+[Allow]

 [Simple mode]

 [Advanced mode]

 [Add JID]

@@ -971,6 +972,7 @@
 [Presence (in)]

 [Presence (out)]

 [Query]

+[List has no rules, empty lists will be deleted then changes applied]

 [allow ]

 [deny ]

 [all.]

@@ -993,6 +995,9 @@
 [Please save list before activating]

 [First, save the list]

 [Please save list before you make it the default list]

+[No list selected]

+[Can't remove active or default list]

+[Sorry]

 [Unable to save list because you are currently offline.]

 [List Editor...]

 ;file \protocols\JabberG\src\jabber_proto.cpp

@@ -1048,6 +1053,10 @@
 [declined subscription]

 [sent error presence]

 [sent unknown presence type]

+[Nick:]

+[Status:]

+[Status text:]

+[Real JID:]

 ;file \protocols\JabberG\src\jabber_thread.cpp

 [Enter password for %s]

 [Error: Not enough memory]

diff --git a/langpacks/english/Plugins/NimContact.txt b/langpacks/english/Plugins/NimContact.txt
index b07be12fc2..d9782d41f1 100644
--- a/langpacks/english/Plugins/NimContact.txt
+++ b/langpacks/english/Plugins/NimContact.txt
@@ -65,7 +65,7 @@
 [Timer intervals... Non-IM Contact Protocol timer is %d seconds]

 [New Non-IM Contact]

 ;file \plugins\Non-IM Contact\src\dialog.cpp

-[String replacing variables....\r\nThe following are all the valid variables that can be used. Refer to the readme for a proper explanation.\r\n\r\nfile(X)\t\t<- specifies the file to read from. MUST be followed by either start() or end() or wholeline()\r\nfilename(X)\t<- copies the filename of file X.\r\nstart(...)\t\t<- specifies where to start copying from.\r\nend(...)\t\t<- specifies where to stop copying.\r\nwholeline(line(...))\t<- specifies a whole line to copy\r\n\r\nstart() and end() explained\r\n.........................\r\nMUST start with line() followed by a number or a string inside " marks, OR csv(separatorX) variable. The number specifies which character in the line to start/end copying. The string specifies a string in the line to start/end copying.\r\n\r\ncsv(seperatorX) explained...\r\nSeperator is either "tab" or "space" or any SINGLE character. X is the Xth seperator to pass before copying, (or to stop before).\r\n\r\nLastly the line(...) variable...\r\nInside the brackets must be either a number (to specify the line number), or a string inside " marks (to use the line with that string), or lastline(X). The X in lastline is the Xth line above the last line i.e. lastline(1) will use the 2nd last line of the file. If searching for a line with "some words" you may put a + or - X after the closing ) i.e. line("some words")+3 to go 3 lines after the line with "some words".\r\n\r\nSome Examples...\r\nfilename(0)    <- will display the filename of the 0th file\r\nfile(0)wholeline(line(0)))    <- will display the whole first line of the 0th file\r\nfile(0)wholeline(line("hello")-1)))    <- the wholeline above the first occurrence of "hello" in the file\r\nfile(0)start(line(lastline(1))csv(tab2))end(line(lastline())csv(tab4)))    <- starts at the 2nd last line of the file, from the 2nd tab variable, until the 4th tab variable in the last line (in the 0th file)\r\nfile(0)start(line("hello")+1"zzzz")end(line(6)17))    <- starts from the first occurrence of zzzz in the line after the first occurrence of hello, until the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n]

+[String replacing variables....\r\nThe following are all the valid variables that can be used. Refer to the readme for a proper explanation.\r\n\r\nfile(X)\t\t<- specifies the file to read from. MUST be followed by either start() or end() or wholeline()\r\nfilename(X)\t<- copies the filename of file X.\r\nstart(...)\t\t<- specifies where to start copying from.\r\nend(...)\t\t<- specifies where to stop copying.\r\nwholeline(line(...))\t<- specifies a whole line to copy\r\n\r\nstart() and end() explained\r\n.........................\r\nMUST start with line() followed by a number or a string inside " marks, OR csv(separatorX) variable. The number specifies which character in the line to start/end copying. The string specifies a string in the line to start/end copying.\r\n\r\ncsv(seperatorX) explained...\r\nSeperator is either "tab" or "space" or any SINGLE character. X is the Xth seperator to pass before copying, (or to stop before).\r\n\r\nLastly the line(...) variable...\r\nInside the brackets must be either a number (to specify the line number), or a string inside " marks (to use the line with that string), or lastline(X). The X in lastline is the Xth line above the last line, i.e., lastline(1) will use the 2nd last line of the file. If searching for a line with "some words" you may put a + or - X after the closing ), i.e., line("some words")+3 to go 3 lines after the line with "some words".\r\n\r\nSome Examples...\r\nfilename(0)    <- will display the filename of the 0th file\r\nfile(0)wholeline(line(0)))    <- will display the whole first line of the 0th file\r\nfile(0)wholeline(line("hello")-1)))    <- the wholeline above the first occurrence of "hello" in the file\r\nfile(0)start(line(lastline(1))csv(tab2))end(line(lastline())csv(tab4)))    <- starts at the 2nd last line of the file, from the 2nd tab variable, until the 4th tab variable in the last line (in the 0th file)\r\nfile(0)start(line("hello")+1"zzzz")end(line(6)17))    <- starts from the first occurrence of zzzz in the line after the first occurrence of hello, until the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n]

 [Contacts Display Info]

 [Link and Contact list Settings]

 [Copy Contact]

diff --git a/langpacks/english/Plugins/PackUpdater.txt b/langpacks/english/Plugins/PackUpdater.txt
index fa46a3f80e..915a084767 100644
--- a/langpacks/english/Plugins/PackUpdater.txt
+++ b/langpacks/english/Plugins/PackUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: PackUpdater.dll

 ;  Plugin: Pack updater

-;  Version: 0.0.1.1

+;  Version: 0.1.0.1

 ;  Authors: Mataes, ZERO_BiT

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

 [Simple updater for Miranda NG premodified packs.]