langpacks/english: updated

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

7 files changed, 26 insertions, 28 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 088394c478..eb262d3394 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1303,6 +1303,7 @@
 [Locked status]

 [Status Icons]

 [%s Icons]

+[Status Icons/]

 [Main Icons]

 ;file \src\modules\skin\sounds.cpp

 [Sound Files]

diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index 760ba1068c..929d3c0ce0 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -1304,6 +1304,7 @@
 [Locked status]

 [Status Icons]

 [%s Icons]

+[Status Icons/]

 [Main Icons]

 ;file \src\modules\skin\sounds.cpp

 [Sound Files]

@@ -10617,7 +10618,7 @@
 [Unable to initialize Notes.]

 [Lotus Notes Extension Manager was not registered. Authentication function will not work propertly]

 [In notes.ini file there is no required entry EXTMGR_ADDINS=plugindllnamewithout".dll"]

-[This utility check your notes.ini file if it's set to autenticate this plugin as safe. Plugin is not added as Lotus Extension, so plugin buildin authentication will not work propertly. Do you want to add Plugin as Lotus Extension (modify notes.ini by adding "EXTMGR_ADDINS=PLUGINNAME\]

+[This utility check your notes.ini file if it's set to autenticate this plugin as safe. Plugin is not added as Lotus Extension, so plugin buildin authentication will not work propertly. Do you want to add Plugin as Lotus Extension (modify notes.ini by adding "EXTMGR_ADDINS=PLUGINNAME")?]

 [LotusNotify plugin configuration]

 [notes.ini modified correctly. Miranda restart required.]

 [notes.ini seem to be set correctly.]

@@ -12473,7 +12474,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\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\]

+[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<- 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. 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 Expamples...\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 occurance 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, untill 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 occurance of zzzz in the line after the first occurance of hello, untill the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n]

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

 [File couldn't be opened]

 [File couldn't be opened,2]

@@ -13804,14 +13805,6 @@
 [Last Year]

 [User-Defined]

 ;file \plugins\Quotes\src\QuoteInfoDlg.cpp

-;file \plugins\Quotes\src\QuotesProviderBase.cpp

-[Log Files (*.txt,*.log)]

-[Enter integer value]

-[Enter log file name.]

-[Enter log file format.]

-[Enter history format.]

-[Enter popup window format.]

-;file \plugins\Quotes\src\QuotesProviderDukasCopy.cpp

 ;file \plugins\Quotes\src\QuotesProviderGoogle.cpp

 [Error occurred during html parsing.]

 [Error occurred during site access.]

@@ -13840,6 +13833,12 @@
 [Previous Close]

 [Change]

 ;file \plugins\Quotes\src\SettingsDlg.cpp

+[Log Files (*.txt,*.log)]

+[Enter integer value]

+[Enter log file name.]

+[Enter log file format.]

+[Enter history format.]

+[Enter popup window format.]

 #muuid {45230488-977b-405b-856d-ea276d7083b7}

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

 ;  File: Rate.dll

@@ -17910,7 +17909,7 @@
 [Set]

 ;file \plugins\TopToolBar\src\toolbar.cpp

 [Default]

-[Frames service has not been found, so plugin will be disabled.\nTo run it you need to install and / or enable contact list plugin that supports it:\n- Modern contact list\n- MultiWindow (MW)\n- Nicer+\nYou can get them at http://miranda-ng.org]

+[Frames service has not been found, so plugin will be disabled.\nTo run it you need to install and / or enable contact list plugin that supports it:\n- Modern contact list\n- MultiWindow (MW)\n- Nicer+\nYou can get them at http://miranda-ng.org/]

 [TopToolBar]

 ;file \plugins\TopToolBar\src\ttbopt.cpp

 [Contact List]

@@ -17945,18 +17944,18 @@
 [Tooltip format string:]

 [Display traffic for current]

 ;file \plugins\TrafficCounter\src\options.cpp

-[Display]

+[Display/]

 [Icon]

 [Account name]

 [Current traffic]

 [Total traffic]

 [Current online]

 [Total online]

-[General]

+[General/]

 [Draw frame as skin element]

 [Show tooltip in traffic window]

 ["Toggle traffic counter" in main menu]

-[Visible accounts]

+[Visible accounts/]

 [Summary traffic for visible accounts]

 [Overall traffic]

 [Hide now]

diff --git a/langpacks/english/Plugins/LotusNotify.txt b/langpacks/english/Plugins/LotusNotify.txt
index 7a6de2dba8..01415f1bf5 100644
--- a/langpacks/english/Plugins/LotusNotify.txt
+++ b/langpacks/english/Plugins/LotusNotify.txt
@@ -42,7 +42,7 @@
 [Unable to initialize Notes.]

 [Lotus Notes Extension Manager was not registered. Authentication function will not work propertly]

 [In notes.ini file there is no required entry EXTMGR_ADDINS=plugindllnamewithout".dll"]

-[This utility check your notes.ini file if it's set to autenticate this plugin as safe. Plugin is not added as Lotus Extension, so plugin buildin authentication will not work propertly. Do you want to add Plugin as Lotus Extension (modify notes.ini by adding "EXTMGR_ADDINS=PLUGINNAME\]

+[This utility check your notes.ini file if it's set to autenticate this plugin as safe. Plugin is not added as Lotus Extension, so plugin buildin authentication will not work propertly. Do you want to add Plugin as Lotus Extension (modify notes.ini by adding "EXTMGR_ADDINS=PLUGINNAME")?]

 [LotusNotify plugin configuration]

 [notes.ini modified correctly. Miranda restart required.]

 [notes.ini seem to be set correctly.]

diff --git a/langpacks/english/Plugins/NimContact.txt b/langpacks/english/Plugins/NimContact.txt
index 3f4943e15c..838ebce98c 100644
--- a/langpacks/english/Plugins/NimContact.txt
+++ b/langpacks/english/Plugins/NimContact.txt
@@ -63,7 +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\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\]

+[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<- 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. 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 Expamples...\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 occurance 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, untill 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 occurance of zzzz in the line after the first occurance of hello, untill the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n]

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

 [File couldn't be opened]

 [File couldn't be opened,2]

diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt
index 6478a658c8..d5edc2fd84 100644
--- a/langpacks/english/Plugins/Quotes.txt
+++ b/langpacks/english/Plugins/Quotes.txt
@@ -120,14 +120,6 @@
 [Last Year]

 [User-Defined]

 ;file \plugins\Quotes\src\QuoteInfoDlg.cpp

-;file \plugins\Quotes\src\QuotesProviderBase.cpp

-[Log Files (*.txt,*.log)]

-[Enter integer value]

-[Enter log file name.]

-[Enter log file format.]

-[Enter history format.]

-[Enter popup window format.]

-;file \plugins\Quotes\src\QuotesProviderDukasCopy.cpp

 ;file \plugins\Quotes\src\QuotesProviderGoogle.cpp

 [Error occurred during html parsing.]

 [Error occurred during site access.]

@@ -156,3 +148,9 @@
 [Previous Close]

 [Change]

 ;file \plugins\Quotes\src\SettingsDlg.cpp

+[Log Files (*.txt,*.log)]

+[Enter integer value]

+[Enter log file name.]

+[Enter log file format.]

+[Enter history format.]

+[Enter popup window format.]

diff --git a/langpacks/english/Plugins/TopToolBar.txt b/langpacks/english/Plugins/TopToolBar.txt
index f3fec923fb..2c57231da4 100644
--- a/langpacks/english/Plugins/TopToolBar.txt
+++ b/langpacks/english/Plugins/TopToolBar.txt
@@ -23,7 +23,7 @@
 [Set]

 ;file \plugins\TopToolBar\src\toolbar.cpp

 [Default]

-[Frames service has not been found, so plugin will be disabled.\nTo run it you need to install and / or enable contact list plugin that supports it:\n- Modern contact list\n- MultiWindow (MW)\n- Nicer+\nYou can get them at http://miranda-ng.org]

+[Frames service has not been found, so plugin will be disabled.\nTo run it you need to install and / or enable contact list plugin that supports it:\n- Modern contact list\n- MultiWindow (MW)\n- Nicer+\nYou can get them at http://miranda-ng.org/]

 [TopToolBar]

 ;file \plugins\TopToolBar\src\ttbopt.cpp

 [Contact List]

diff --git a/langpacks/english/Plugins/TrafficCounter.txt b/langpacks/english/Plugins/TrafficCounter.txt
index e1de7f87aa..3518e81ab0 100644
--- a/langpacks/english/Plugins/TrafficCounter.txt
+++ b/langpacks/english/Plugins/TrafficCounter.txt
@@ -28,18 +28,18 @@
 [Tooltip format string:]

 [Display traffic for current]

 ;file \plugins\TrafficCounter\src\options.cpp

-[Display]

+[Display/]

 [Icon]

 [Account name]

 [Current traffic]

 [Total traffic]

 [Current online]

 [Total online]

-[General]

+[General/]

 [Draw frame as skin element]

 [Show tooltip in traffic window]

 ["Toggle traffic counter" in main menu]

-[Visible accounts]

+[Visible accounts/]

 [Summary traffic for visible accounts]

 [Overall traffic]

 [Hide now]