13 files changed, 44 insertions, 30 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 1907efe80b..8ab7bca439 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1303,7 +1303,6 @@
 [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 7c9a63ac57..de5a4f3341 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -1304,7 +1304,6 @@
 [Locked status]
 [Status Icons]
 [%s Icons]
-[Status Icons/]
 [Main Icons]
 ;file \src\modules\skin\sounds.cpp
 [Sound Files]
@@ -1867,7 +1866,7 @@
 [You enabled "Change my status mode to" in the "Idle" options dialog, AdvancedAutoAway's options are ignored.]
 [Monitor keyboard activity]
 [Monitor mouse activity]
-[Ignore CRTL, ALT, SHIFT, TAB, ESC and Windows keys]
+[Ignore CTRL, ALT, SHIFT, TAB, ESC and Windows keys]
 [Ignore any key combination with above keys]
 [Accounts]
 [Enable checking]
@@ -2625,7 +2624,7 @@
 ;============================================================
 ;  File: BasicHistory.dll
 ;  Plugin: Basic history
-;  Version: 1.0.1.9
+;  Version: 1.0.1.10
 ;  Authors: Krzysztof Kral
 ;============================================================
 [History viewer for Miranda NG.]
@@ -6083,7 +6082,7 @@
 ;============================================================
 ;  File: FltContacts.dll
 ;  Plugin: Floating contacts
-;  Version: 0.7.0.0
+;  Version: 0.7.0.1
 ;  Authors: Iavor Vajarov, Kosh&chka, Victor Pavlychko
 ;============================================================
 [Floating Contacts plugin for Miranda.]
@@ -6518,7 +6517,7 @@
 ;file \protocols\Gadu-Gadu\src\import.cpp
 [You have to be connected before you can import/export contacts from/to server.]
 [List cannot be imported because of error:\n\t%s (Error: %d)]
-[List cannot be removeed because of error: %s (Error: %d)]
+[List cannot be removed because of error: %s (Error: %d)]
 [Text files]
 [All Files]
 [List cannot be imported from file "%s" because of error:\n\t%s (Error: %d)]
@@ -10182,7 +10181,7 @@
 [You enabled "Change my status mode to" in the "Idle" options dialog, AdvancedAutoAway's options are ignored.]
 [Monitor keyboard activity]
 [Monitor mouse activity]
-[Ignore CRTL, ALT, SHIFT, TAB, ESC and Windows keys]
+[Ignore CTRL, ALT, SHIFT, TAB, ESC and Windows keys]
 [Ignore any key combination with above keys]
 [Accounts]
 [Enable checking]
@@ -10841,7 +10840,8 @@
 [on left mouse button click]
 [on right mouse button click]
 [on middle mouse button click\n(note: use middle mouse button to send multiple messages from Firefox)]
-[Show Miranda menu only in this firefox profiles (comma delimited)]
+[Firefox profiles]
+[Show Miranda menu only in these firefox profiles (comma delimited)]
 [Show these contacts in 'Send ... to' option in Firefox]
 [Show these accounts in 'Set status message' option in Firefox]
 ;file \plugins\MirFox\src\MirandaInterface.cpp
@@ -12468,14 +12468,22 @@
 [Copy / Export contact]
 [&Export Non-IM Contact]
 [Co&py Non-IM Contact]
-[Type one replace string per line in the format "origional text,new text"]
+[Type one replace string per line in the format "original text,new text"]
 [EXAMPLE: %fn1,%fn2]
 ;file \plugins\Non-IM Contact\src\contactinfo.cpp
 [Select Folder]
+[Non-IM Contact protocol timer is Disabled]
+[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<- 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]
+[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 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, 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 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]
+[Contacts Display Info]
+[Link and CList Settings]
+[Copy Contact]
+[Files]
+[Edit Non-IM Contact "%s"]
 ;file \plugins\Non-IM Contact\src\files.cpp
+[Do you want to overwrite the contents of the file?\r\n\r\nPressing No will append these contacts to the end of the file.]
 [File couldn't be opened]
 [File couldn't be opened,2]
 [line(%-3d) = | %s]
@@ -13276,7 +13284,6 @@
 [Miranda's window]
 [the active window]
 [Transparency]
-[Enable Win 9x/Me transparency]
 [Use transparency]
 [opacity:]
 [Opaque popups under cursor]
@@ -15891,7 +15898,7 @@
 [You enabled "Change my status mode to" in the "Idle" options dialog, AdvancedAutoAway's options are ignored.]
 [Monitor keyboard activity]
 [Monitor mouse activity]
-[Ignore CRTL, ALT, SHIFT, TAB, ESC and Windows keys]
+[Ignore CTRL, ALT, SHIFT, TAB, ESC and Windows keys]
 [Ignore any key combination with above keys]
 [Accounts]
 [Enable checking]
@@ -17004,7 +17011,7 @@
 [How to create tabs and windows for incoming messages]
 [Show status text on tabs]
 [Prefer xStatus icons when available]
-[Detailed tooltip on tabs (requires mToolTip or Tipper plugin)]
+[Detailed tooltip on tabs (requires Tipper plugin)]
 [ALWAYS activate new message sessions (has PRIORITY over the options below)]
 [Automatically create new message sessions without activating them]
 [New windows are minimized (the option above MUST be active)]
@@ -17945,18 +17952,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/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt
index a36cc62077..d0ec430e76 100644
--- a/langpacks/english/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/english/Plugins/AdvancedAutoAway.txt
@@ -96,7 +96,7 @@
 [You enabled "Change my status mode to" in the "Idle" options dialog, AdvancedAutoAway's options are ignored.]
 [Monitor keyboard activity]
 [Monitor mouse activity]
-[Ignore CRTL, ALT, SHIFT, TAB, ESC and Windows keys]
+[Ignore CTRL, ALT, SHIFT, TAB, ESC and Windows keys]
 [Ignore any key combination with above keys]
 [Accounts]
 [Enable checking]
diff --git a/langpacks/english/Plugins/BasicHistory.txt b/langpacks/english/Plugins/BasicHistory.txt
index fdcac7e07a..7bdf244f2f 100644
--- a/langpacks/english/Plugins/BasicHistory.txt
+++ b/langpacks/english/Plugins/BasicHistory.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: BasicHistory.dll
 ;  Plugin: Basic history
-;  Version: 1.0.1.9
+;  Version: 1.0.1.10
 ;  Authors: Krzysztof Kral
 ;============================================================
 [History viewer for Miranda NG.]
diff --git a/langpacks/english/Plugins/FltContacts.txt b/langpacks/english/Plugins/FltContacts.txt
index 33049d7166..e7a4d13188 100644
--- a/langpacks/english/Plugins/FltContacts.txt
+++ b/langpacks/english/Plugins/FltContacts.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: FltContacts.dll
 ;  Plugin: Floating contacts
-;  Version: 0.7.0.0
+;  Version: 0.7.0.1
 ;  Authors: Iavor Vajarov, Kosh&chka, Victor Pavlychko
 ;============================================================
 [Floating Contacts plugin for Miranda.]
diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index 2064ab2820..1aed2da12a 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -189,7 +189,7 @@
 ;file \protocols\Gadu-Gadu\src\import.cpp
 [You have to be connected before you can import/export contacts from/to server.]
 [List cannot be imported because of error:\n\t%s (Error: %d)]
-[List cannot be removeed because of error: %s (Error: %d)]
+[List cannot be removed because of error: %s (Error: %d)]
 [Text files]
 [All Files]
 [List cannot be imported from file "%s" because of error:\n\t%s (Error: %d)]
diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index c865b7a613..98bff1f385 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -96,7 +96,7 @@
 [You enabled "Change my status mode to" in the "Idle" options dialog, AdvancedAutoAway's options are ignored.]
 [Monitor keyboard activity]
 [Monitor mouse activity]
-[Ignore CRTL, ALT, SHIFT, TAB, ESC and Windows keys]
+[Ignore CTRL, ALT, SHIFT, TAB, ESC and Windows keys]
 [Ignore any key combination with above keys]
 [Accounts]
 [Enable checking]
diff --git a/langpacks/english/Plugins/MirFox.txt b/langpacks/english/Plugins/MirFox.txt
index 122ca9a6c6..e838537c03 100644
--- a/langpacks/english/Plugins/MirFox.txt
+++ b/langpacks/english/Plugins/MirFox.txt
@@ -11,7 +11,8 @@
 [on left mouse button click]
 [on right mouse button click]
 [on middle mouse button click\n(note: use middle mouse button to send multiple messages from Firefox)]
-[Show Miranda menu only in this firefox profiles (comma delimited)]
+[Firefox profiles]
+[Show Miranda menu only in these firefox profiles (comma delimited)]
 [Show these contacts in 'Send ... to' option in Firefox]
 [Show these accounts in 'Set status message' option in Firefox]
 ;file \plugins\MirFox\src\MirandaInterface.cpp
diff --git a/langpacks/english/Plugins/NimContact.txt b/langpacks/english/Plugins/NimContact.txt
index 838ebce98c..998f600180 100644
--- a/langpacks/english/Plugins/NimContact.txt
+++ b/langpacks/english/Plugins/NimContact.txt
@@ -57,14 +57,22 @@
 [Copy / Export contact]
 [&Export Non-IM Contact]
 [Co&py Non-IM Contact]
-[Type one replace string per line in the format "origional text,new text"]
+[Type one replace string per line in the format "original text,new text"]
 [EXAMPLE: %fn1,%fn2]
 ;file \plugins\Non-IM Contact\src\contactinfo.cpp
 [Select Folder]
+[Non-IM Contact protocol timer is Disabled]
+[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<- 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]
+[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 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, 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 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]
+[Contacts Display Info]
+[Link and CList Settings]
+[Copy Contact]
+[Files]
+[Edit Non-IM Contact "%s"]
 ;file \plugins\Non-IM Contact\src\files.cpp
+[Do you want to overwrite the contents of the file?\r\n\r\nPressing No will append these contacts to the end of the file.]
 [File couldn't be opened]
 [File couldn't be opened,2]
 [line(%-3d) = | %s]
diff --git a/langpacks/english/Plugins/Popup.txt b/langpacks/english/Plugins/Popup.txt
index 654040f865..8d9373b6c2 100644
--- a/langpacks/english/Plugins/Popup.txt
+++ b/langpacks/english/Plugins/Popup.txt
@@ -30,7 +30,6 @@
 [Miranda's window]
 [the active window]
 [Transparency]
-[Enable Win 9x/Me transparency]
 [Use transparency]
 [opacity:]
 [Opaque popups under cursor]
diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index 66da2b2972..1ce93e16b3 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -96,7 +96,7 @@
 [You enabled "Change my status mode to" in the "Idle" options dialog, AdvancedAutoAway's options are ignored.]
 [Monitor keyboard activity]
 [Monitor mouse activity]
-[Ignore CRTL, ALT, SHIFT, TAB, ESC and Windows keys]
+[Ignore CTRL, ALT, SHIFT, TAB, ESC and Windows keys]
 [Ignore any key combination with above keys]
 [Accounts]
 [Enable checking]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 2976cac3e7..e42be2bcdd 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -902,7 +902,7 @@
 [How to create tabs and windows for incoming messages]
 [Show status text on tabs]
 [Prefer xStatus icons when available]
-[Detailed tooltip on tabs (requires mToolTip or Tipper plugin)]
+[Detailed tooltip on tabs (requires Tipper plugin)]
 [ALWAYS activate new message sessions (has PRIORITY over the options below)]
 [Automatically create new message sessions without activating them]
 [New windows are minimized (the option above MUST be active)]
diff --git a/langpacks/english/Plugins/TrafficCounter.txt b/langpacks/english/Plugins/TrafficCounter.txt
index 3518e81ab0..e1de7f87aa 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]