- langpacks/english: updated

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

2 files changed, 2 insertions, 56 deletions

diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index d16eda2610..760ba1068c 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -12473,19 +12473,7 @@
 [Select Folder]

 [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\n\
-file(X)\t\t<- specifies the file to read from\r\nMUST be followed by either start() or end() or wholeline()\r\n\
-filename(X)\t\t<- copyies the filename of file X.\r\n\
-start(...)\t\t<-specifies where to start copying from.\r\n\
-end(...)\t\t<-specifies where to stop copying.\r\n\
-wholeline(line(...))\t<-specifies a whole line to copy\r\n\r\n\
-start() and end() explained\r\n.........................\r\n\
-MUST start with line() followed by a number or a string inside " marks, OR csv(seperatorX) variable\r\n\
-The number specifies which character in the line to start/end copying.\r\nThe string specifies a string in the line to start/end copying.\r\n\
-csv(seperatorX) explained...\r\nseperator is either "tab" or "space" or any SINGLE character.\r\nX is the Xth seperator to pass before copying, (or to stop before)\r\n\r\n\
-Lastly the line(...) variable...\r\n\
-Inside 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).\r\nthe X in lastline is the Xth line above the last line. i.e lastline(1) will use the 2nd last line of the file.\r\n\
-If searching for a line with u may put a + or - X after the closing ) i.e line("some words\]

+[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\r\nMUST be followed by either start() or end() or wholeline()\r\nfilename(X)\t\t<- copyies 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(seperatorX) variable\r\nThe number specifies which character in the line to start/end copying.\r\nThe string specifies a string in the line to start/end copying.\r\ncsv(seperatorX) explained...\r\nseperator is either "tab" or "space" or any SINGLE character.\r\nX 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).\r\nthe X in lastline is the Xth line above the last line. i.e lastline(1) will use the 2nd last line of the file.\r\nIf searching for a line with u may put a + or - X after the closing ) i.e line("some words\]

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

 [File couldn't be opened]

 [File couldn't be opened,2]

@@ -12504,21 +12492,6 @@ If searching for a line with u may put a + or - X after the closing ) i.e line("
 [&String Maker]

 [E&dit Contact Settings]

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

-[lastline(]

-[csv(]

-[compare("]

-[save("]

-[load("]

-[saveN("]

-[loadN("]

-[lastchecked(file(]

-[file(]

-[wholeline(line(]

-[start(]

-[start(line(]

-[end(]

-[end(line(]

-[filename(]

 [%s - ERROR: no line specified or line not found (in %s)]

 [%s - ERROR: file couldnt be opened (in %s)]

 [%s - ERROR: no file specified in settings (in %s)]

diff --git a/langpacks/english/Plugins/NimContact.txt b/langpacks/english/Plugins/NimContact.txt
index 209f782e10..3f4943e15c 100644
--- a/langpacks/english/Plugins/NimContact.txt
+++ b/langpacks/english/Plugins/NimContact.txt
@@ -63,19 +63,7 @@
 [Select Folder]

 [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\n\
-file(X)\t\t<- specifies the file to read from\r\nMUST be followed by either start() or end() or wholeline()\r\n\
-filename(X)\t\t<- copyies the filename of file X.\r\n\
-start(...)\t\t<-specifies where to start copying from.\r\n\
-end(...)\t\t<-specifies where to stop copying.\r\n\
-wholeline(line(...))\t<-specifies a whole line to copy\r\n\r\n\
-start() and end() explained\r\n.........................\r\n\
-MUST start with line() followed by a number or a string inside " marks, OR csv(seperatorX) variable\r\n\
-The number specifies which character in the line to start/end copying.\r\nThe string specifies a string in the line to start/end copying.\r\n\
-csv(seperatorX) explained...\r\nseperator is either "tab" or "space" or any SINGLE character.\r\nX is the Xth seperator to pass before copying, (or to stop before)\r\n\r\n\
-Lastly the line(...) variable...\r\n\
-Inside 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).\r\nthe X in lastline is the Xth line above the last line. i.e lastline(1) will use the 2nd last line of the file.\r\n\
-If searching for a line with u may put a + or - X after the closing ) i.e line("some words\]

+[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\r\nMUST be followed by either start() or end() or wholeline()\r\nfilename(X)\t\t<- copyies 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(seperatorX) variable\r\nThe number specifies which character in the line to start/end copying.\r\nThe string specifies a string in the line to start/end copying.\r\ncsv(seperatorX) explained...\r\nseperator is either "tab" or "space" or any SINGLE character.\r\nX 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).\r\nthe X in lastline is the Xth line above the last line. i.e lastline(1) will use the 2nd last line of the file.\r\nIf searching for a line with u may put a + or - X after the closing ) i.e line("some words\]

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

 [File couldn't be opened]

 [File couldn't be opened,2]

@@ -94,21 +82,6 @@ If searching for a line with u may put a + or - X after the closing ) i.e line("
 [&String Maker]

 [E&dit Contact Settings]

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

-[lastline(]

-[csv(]

-[compare("]

-[save("]

-[load("]

-[saveN("]

-[loadN("]

-[lastchecked(file(]

-[file(]

-[wholeline(line(]

-[start(]

-[start(line(]

-[end(]

-[end(line(]

-[filename(]

 [%s - ERROR: no line specified or line not found (in %s)]

 [%s - ERROR: file couldnt be opened (in %s)]

 [%s - ERROR: no file specified in settings (in %s)]