9 files changed, 30 insertions, 30 deletions
diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index de5a4f3341..c21930d453 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -5702,14 +5702,19 @@
 [Use local time for received messages]
 [Use this server for opening links:]
 [Allow posting statuses to my pages (may slow down login)]
+;file \protocols\FacebookRM\src\chat.cpp
+[&Invite user...]
+[&Leave chat session]
+[User &details]
+[User &history]
 ;file \protocols\FacebookRM\src\communication.cpp
 [Login error: %s]
 [Unknown error]
 [Login error: Invalid request.]
-[Your account requires HTTPS connection. Activating.]
 [Login error: Some Facebook things are required.]
 [Login error: Captcha code is required. Bad login credentials?]
 [Login error, probably bad login credentials.]
+[Your account requires HTTPS connection. Activating.]
 [Something happened to Facebook. Maybe there was some major update so you should wait for an update.]
 [Need confirmation for sending messages to other clients.\nOpen facebook website and try to send message to this contact again!]
 [Timeout when sending message.]
@@ -5755,6 +5760,7 @@
 [photos]
 [a photo]
 [User sent you %s:]
+[Message read: %s by %s]
 [Message read: %s]
 ;file \protocols\FacebookRM\src\messages.cpp
 [You cannot send messages when you are offline.]
@@ -6572,7 +6578,7 @@
 ;============================================================
 ;  File: GTalkExt.dll
 ;  Plugin: GTalk Extension
-;  Version: 0.0.1.1
+;  Version: 0.1.0.2
 ;  Authors: bems
 ;============================================================
 [GTalk extensions for Jabber protocol]
@@ -6580,6 +6586,9 @@
 [Popup notifications (needs popup plugin)]
 [Notify in fullscreen mode too]
 [Use this if your popup plugin does not correctly detect fullscreen mode. It will take away your keyboard focus]
+[Notify in contact list]
+[Clear pseudocontact history before adding new events]
+[Mark history event read when popup closed]
 [Add message snip to notification]
 [Try to login before open mailbox]
 [This works only if password is saved in the database. Has no effect on links in pseudocontact message log]
@@ -6595,8 +6604,6 @@
 [Test]
 ;file \protocols\GTalkExt\src\menu.cpp
 [Open mailbox]
-;file \protocols\GTalkExt\src\notifications.cpp
-[You've received an e-mail\n%s unread threads]
 ;file \protocols\GTalkExt\src\options.cpp
 [Popups]
 [Network]
@@ -9020,6 +9027,7 @@
 [Frame text]
 [Jabber Activity]
 [Jabber Mood]
+[Fatal error, image services not found. Flags Module will be disabled.]
 ;file \protocols\JabberG\src\jabber.h
 [I'm happy Miranda NG user. Get it at http://miranda-ng.org/.]
 [/me slaps %s around a bit with a large trout]
@@ -9088,7 +9096,6 @@
 [Supports Miranda NG notes extension]
 [Supports Jingle]
 [Supports Roster Exchange]
-[Supports GTalk private multi-user chat]
 ;file \protocols\JabberG\src\jabber_captcha.cpp
 [Enter the text you see]
 ;file \protocols\JabberG\src\jabber_chat.cpp
@@ -10841,7 +10848,7 @@
 [on right mouse button click]
 [on middle mouse button click\n(note: use middle mouse button to send multiple messages from Firefox)]
 [Firefox profiles]
-[Show Miranda menu only in these firefox profiles (comma delimited)]
+[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
@@ -12476,7 +12483,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 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]
+[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, until 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]
@@ -14979,7 +14986,7 @@
 ;============================================================
 ;  File: ShlExt.dll
 ;  Plugin: Shell extension
-;  Version: 2.2.0.2
+;  Version: 2.2.0.3
 ;  Authors: Sam Kothari, Miranda NG Team
 ;============================================================
 [Windows Explorer extension for Miranda NG.]
@@ -17042,7 +17049,6 @@
 [Edit user notes|You are editing the user notes. Click the button again or use the hotkey (default: Alt-N) to save the notes and return to normal messaging mode]
 [Missing component|The icon pack is missing. Please install it to the default icons folder.\n\nNo icons will be available]
 [Aero peek warning|You have enabled Aero Peek features and loaded a custom container window skin\n\nThis can result in minor visual anomalies in the live preview feature.]
-[TabSRMM group chat module|TabSRMM could not enable its group chat module. The most likely cause is that you have installed and enabled \\b1chat.dll\\b0  or another plugin that provides groupchat services.\n\nShould I try to fix this now \\b1(a restart of Miranda is required to apply these changes)?\\b0]
 [Filetransfer problem|Sending the image by file transfer failed.\n\nPossible reasons: File transfers not supported, either you or the target contact is offline, or you are invisible and the target contact is not on your visibilty list.]
 [Settings problem|The option \\b1 History->Imitate IEView API\\b0  is enabled and the History++ plugin is active. This can cause problems when using IEView as message log viewer.\n\nShould I correct the option (a restart is required)?]
 [Closing Window|You are about to close a window with multiple tabs open.\n\nProceed?]
@@ -18794,8 +18800,6 @@
 [External Applications]
 [retrieves song name of the song currently playing in Winamp]
 [retrieves current Winamp state (Playing/Paused/Stopped)]
-[retrieves info from AMIP (x is var_<variable> with any AMIP variable)]
-[retrieves info from AMIP (x is AMIP format string)]
 ;file \plugins\Variables\src\parse_inet.cpp
 [Internet Related]
 [converts each non-html character into hex format]
@@ -18943,10 +18947,6 @@
 [variable set by put(s) with name x]
 [x, and stores y as variable named x]
 [only stores y as variables x]
-;file \plugins\Variables\src\parse_xml.cpp
-[XML]
-[apply stylesheet file x to document file y]
-[apply stylesheet x to document y]
 ;file \plugins\Variables\src\variables.cpp
 #muuid {2f174488-489c-4fe1-940d-596cf0f35e65}
 ;============================================================
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 67870e9c7f..633e4953a5 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -45,14 +45,19 @@
 [Use local time for received messages]
 [Use this server for opening links:]
 [Allow posting statuses to my pages (may slow down login)]
+;file \protocols\FacebookRM\src\chat.cpp
+[&Invite user...]
+[&Leave chat session]
+[User &details]
+[User &history]
 ;file \protocols\FacebookRM\src\communication.cpp
 [Login error: %s]
 [Unknown error]
 [Login error: Invalid request.]
-[Your account requires HTTPS connection. Activating.]
 [Login error: Some Facebook things are required.]
 [Login error: Captcha code is required. Bad login credentials?]
 [Login error, probably bad login credentials.]
+[Your account requires HTTPS connection. Activating.]
 [Something happened to Facebook. Maybe there was some major update so you should wait for an update.]
 [Need confirmation for sending messages to other clients.\nOpen facebook website and try to send message to this contact again!]
 [Timeout when sending message.]
@@ -98,6 +103,7 @@
 [photos]
 [a photo]
 [User sent you %s:]
+[Message read: %s by %s]
 [Message read: %s]
 ;file \protocols\FacebookRM\src\messages.cpp
 [You cannot send messages when you are offline.]
diff --git a/langpacks/english/Plugins/GTalkExt.txt b/langpacks/english/Plugins/GTalkExt.txt
index 458612f5e2..1eb6f173b7 100644
--- a/langpacks/english/Plugins/GTalkExt.txt
+++ b/langpacks/english/Plugins/GTalkExt.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: GTalkExt.dll
 ;  Plugin: GTalk Extension
-;  Version: 0.0.1.1
+;  Version: 0.1.0.2
 ;  Authors: bems
 ;============================================================
 [GTalk extensions for Jabber protocol]
@@ -10,6 +10,9 @@
 [Popup notifications (needs popup plugin)]
 [Notify in fullscreen mode too]
 [Use this if your popup plugin does not correctly detect fullscreen mode. It will take away your keyboard focus]
+[Notify in contact list]
+[Clear pseudocontact history before adding new events]
+[Mark history event read when popup closed]
 [Add message snip to notification]
 [Try to login before open mailbox]
 [This works only if password is saved in the database. Has no effect on links in pseudocontact message log]
@@ -25,8 +28,6 @@
 [Test]
 ;file \protocols\GTalkExt\src\menu.cpp
 [Open mailbox]
-;file \protocols\GTalkExt\src\notifications.cpp
-[You've received an e-mail\n%s unread threads]
 ;file \protocols\GTalkExt\src\options.cpp
 [Popups]
 [Network]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index ad59086527..f140224956 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -231,6 +231,7 @@
 [Frame text]
 [Jabber Activity]
 [Jabber Mood]
+[Fatal error, image services not found. Flags Module will be disabled.]
 ;file \protocols\JabberG\src\jabber.h
 [I'm happy Miranda NG user. Get it at http://miranda-ng.org/.]
 [/me slaps %s around a bit with a large trout]
@@ -299,7 +300,6 @@
 [Supports Miranda NG notes extension]
 [Supports Jingle]
 [Supports Roster Exchange]
-[Supports GTalk private multi-user chat]
 ;file \protocols\JabberG\src\jabber_captcha.cpp
 [Enter the text you see]
 ;file \protocols\JabberG\src\jabber_chat.cpp
diff --git a/langpacks/english/Plugins/MirFox.txt b/langpacks/english/Plugins/MirFox.txt
index e838537c03..5a977aee93 100644
--- a/langpacks/english/Plugins/MirFox.txt
+++ b/langpacks/english/Plugins/MirFox.txt
@@ -12,7 +12,7 @@
 [on right mouse button click]
 [on middle mouse button click\n(note: use middle mouse button to send multiple messages from Firefox)]
 [Firefox profiles]
-[Show Miranda menu only in these firefox profiles (comma delimited)]
+[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 998f600180..4807fd4f90 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 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]
+[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, until 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]
diff --git a/langpacks/english/Plugins/ShlExt.txt b/langpacks/english/Plugins/ShlExt.txt
index 09f9f38c34..8b6a433546 100644
--- a/langpacks/english/Plugins/ShlExt.txt
+++ b/langpacks/english/Plugins/ShlExt.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: ShlExt.dll
 ;  Plugin: Shell extension
-;  Version: 2.2.0.2
+;  Version: 2.2.0.3
 ;  Authors: Sam Kothari, Miranda NG Team
 ;============================================================
 [Windows Explorer extension for Miranda NG.]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index e42be2bcdd..87b088f4ea 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -933,7 +933,6 @@
 [Edit user notes|You are editing the user notes. Click the button again or use the hotkey (default: Alt-N) to save the notes and return to normal messaging mode]
 [Missing component|The icon pack is missing. Please install it to the default icons folder.\n\nNo icons will be available]
 [Aero peek warning|You have enabled Aero Peek features and loaded a custom container window skin\n\nThis can result in minor visual anomalies in the live preview feature.]
-[TabSRMM group chat module|TabSRMM could not enable its group chat module. The most likely cause is that you have installed and enabled \\b1chat.dll\\b0  or another plugin that provides groupchat services.\n\nShould I try to fix this now \\b1(a restart of Miranda is required to apply these changes)?\\b0]
 [Filetransfer problem|Sending the image by file transfer failed.\n\nPossible reasons: File transfers not supported, either you or the target contact is offline, or you are invisible and the target contact is not on your visibilty list.]
 [Settings problem|The option \\b1 History->Imitate IEView API\\b0  is enabled and the History++ plugin is active. This can cause problems when using IEView as message log viewer.\n\nShould I correct the option (a restart is required)?]
 [Closing Window|You are about to close a window with multiple tabs open.\n\nProceed?]
diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt
index c934871538..a958d2daf6 100644
--- a/langpacks/english/Plugins/Variables.txt
+++ b/langpacks/english/Plugins/Variables.txt
@@ -50,8 +50,6 @@
 [External Applications]
 [retrieves song name of the song currently playing in Winamp]
 [retrieves current Winamp state (Playing/Paused/Stopped)]
-[retrieves info from AMIP (x is var_<variable> with any AMIP variable)]
-[retrieves info from AMIP (x is AMIP format string)]
 ;file \plugins\Variables\src\parse_inet.cpp
 [Internet Related]
 [converts each non-html character into hex format]
@@ -199,8 +197,4 @@
 [variable set by put(s) with name x]
 [x, and stores y as variable named x]
 [only stores y as variables x]
-;file \plugins\Variables\src\parse_xml.cpp
-[XML]
-[apply stylesheet file x to document file y]
-[apply stylesheet x to document y]
 ;file \plugins\Variables\src\variables.cpp