- langpacks/english: updated

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

12 files changed, 18 insertions, 19 deletions

diff --git a/langpacks/english/Plugins/BasicHistory.txt b/langpacks/english/Plugins/BasicHistory.txt
index 6eafaa37a4..d6d1e554e6 100644
--- a/langpacks/english/Plugins/BasicHistory.txt
+++ b/langpacks/english/Plugins/BasicHistory.txt
@@ -136,7 +136,7 @@
 [Link]

 [Authorization request]

 [You were added]

-[Contacts recieved]

+[Contacts received]

 [SMTP Simple Email]

 [SMS message]

 [Group list]

diff --git a/langpacks/english/Plugins/BuddyPounce.txt b/langpacks/english/Plugins/BuddyPounce.txt
index ded07f86ed..70ccf435cc 100644
--- a/langpacks/english/Plugins/BuddyPounce.txt
+++ b/langpacks/english/Plugins/BuddyPounce.txt
@@ -59,7 +59,7 @@
 [To On The Phone]

 [To Out To Lunch]

 [The Message    (%d Characters)]

-[Couldnt Allocate enough memory]

+[Couldn't allocate enough memory]

 [error......]

 [The Message    (0 Characters)]

 [Reuse this message? (0 to use it once)]

diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt
index b5c853020f..edc86c0a05 100644
--- a/langpacks/english/Plugins/DbEditorPP.txt
+++ b/langpacks/english/Plugins/DbEditorPP.txt
@@ -126,7 +126,7 @@
 [Edit UNICODE value]

 [New BLOB value]

 [Edit BLOB value]

-[Couldnt allocate enough memory!]

+[Couldn't allocate enough memory!]

 ;file \plugins\DbEditorPP\src\copymodule.cpp

 [Settings]

 ;file \plugins\DbEditorPP\src\deletemodule.cpp

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 4ec776d1cf..5e19698180 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -37,7 +37,6 @@
 [Advanced Settings]

 [Force secure (HTTPS) connection]

 [Post Miranda statuses to Wall]

-[Enable logging for debugging purposes]

 [Use secure connection also for channel requests]

 [Also disconnect chat when going to offline]

 [Map non-standard statuses to Invisible (instead of Online)]

diff --git a/langpacks/english/Plugins/FavContacts.txt b/langpacks/english/Plugins/FavContacts.txt
index f972360235..4cf8f8d946 100644
--- a/langpacks/english/Plugins/FavContacts.txt
+++ b/langpacks/english/Plugins/FavContacts.txt
@@ -36,7 +36,6 @@
 [Selected second line (color)]

 [Background]

 [Selected background]

-[Favourite Contacts]

 [Show favorite contacts]

 [Contacts]

 [Favorites]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index b02f71466a..2aad887f1f 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -1030,7 +1030,7 @@
 [Choose the groupchats you want to leave]

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

 [Error %s %s\r\nPlease select other server]

-[Error Unknown reply recieved\r\nPlease select other server]

+[Error Unknown reply received\r\nPlease select other server]

 [Error %s %s\r\nTry to specify more detailed]

 [Search error]

 [Select/type search service URL above and press <Go>]

diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt
index f951256a0d..62679ddf31 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -51,7 +51,7 @@
 [Files exchange]

 [No out connection on send]

 [No out connection on receive]

-[Out connections: ignory additional ports (443, 2041)]

+[Out connections: ignore additional ports (443, 2041)]

 [Hide my IP addresses]

 [Add extra address]

 [Your host (or router):]

@@ -80,7 +80,7 @@
 [OK]

 [Cancel]

 [Notify]

-[Writed:]

+[Written:]

 [Select e-mail]

 ;file \protocols\MRA\src\MraAdvancedSearch.cpp

 [Male]

@@ -131,7 +131,7 @@
 [Zhuki]

 [Web search]

 [Update all users info]

-[Check updates users avatars]

+[Check users avatars updates]

 [Request authorization for all]

 [Request authorization]

 [Grant authorization]

@@ -153,7 +153,7 @@
 ;file \protocols\MRA\src\MraFilesQueue.cpp

 [Receive files: can't allocate disk space for file, size %lu bytes, error]

 [Receive files: can't open file %s, error]

-[Receive files: request for file %s not sended, error]

+[Receive files: request for file %s not sent, error]

 [Send files: can't open file %s, error]

 [Send files: requested file: %S - not found in send files list.]

 ;file \protocols\MRA\src\MraIcons.cpp

@@ -184,7 +184,7 @@
 [Closing in %ld]

 [Reply to %s blog status]

 [Set my blog status]

-[Writed]

+[Written]

 ;file \protocols\MRA\src\Mra_options.cpp

 [Network]

 [Account]

diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index 935ae678d0..add17710f8 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -31,7 +31,7 @@
 [GnuPG binary:]

 [Browse]

 [Turn on key autoexchange]

-[The new public key was recieved]

+[The new public key was received]

 [Import key]

 [Accept and enable encryption]

 [Ignore]

@@ -55,9 +55,9 @@
 [Default password]

 [Import]

 [Select keyserver for key search:]

-[Recieved encrypted file]

+[Received encrypted file]

 [Decrypt]

-[Recieved encrypted file form contact with disabled encryption.]

+[Received encrypted file form contact with disabled encryption.]

 [Remember choice]

 [Choose which keys to export]

 [Export public keys (only set for contacts)]

@@ -108,7 +108,7 @@
 [Error]

 [Generating new random key, please wait]

 [Failed to alocate memory]

-[GPG binary found in Miranda folder, but English locale does not exist.\nIt's highly recommended to place \\gnupg.nls\\en@quot.mo in GnuPG folder under Miranda root.\nWithout this file you may experience many problems with GPG output on non-English systems\nand plugin may completely not work.\nYou have beed warned.]

+[GPG binary found in Miranda folder, but English locale does not exist.\nIt's highly recommended to place \\gnupg.nls\\en@quot.mo in GnuPG folder under Miranda root.\nWithout this file you may experience many problems with GPG output on non-English systems\nand plugin may completely not work.\nYou have been warned.]

 [Warning]

 [Wrong GPG binary location found in system.\nPlease choose another location]

 [This is not GnuPG binary!\nIt is recommended to use GnuPG v1.x.x with this plugin.]

diff --git a/langpacks/english/Plugins/NimContact.txt b/langpacks/english/Plugins/NimContact.txt
index 4194cb0362..f58b0a4355 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, 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 CList Settings]

 [Copy Contact]

@@ -91,5 +91,5 @@
 [E&dit Contact Settings]

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

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

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

+[%s - ERROR: file couldn't be opened (in %s)]

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

diff --git a/langpacks/english/Plugins/Skype.txt b/langpacks/english/Plugins/Skype.txt
index a2c1d12b07..6fc4f61658 100644
--- a/langpacks/english/Plugins/Skype.txt
+++ b/langpacks/english/Plugins/Skype.txt
@@ -185,7 +185,7 @@
 [Protocols]

 ;file \protocols\Skype\src\skype_ignore_list.cpp

 ;file \protocols\Skype\src\skype_instances.cpp

-[Skype protocol plugin only permit you to login to one account at a time. Adding multiple accounts is prohibited in the licence agreement and standard distribution terms of SkypeKit.]

+[Skype protocol plugin only permits you to login to one account at a time. Adding multiple accounts is prohibited in the licence agreement and standard distribution terms of SkypeKit.]

 [Initialization key corrupted or not valid.]

 [SkypeKit did not initialize (%d).]

 [SkypeKit did not start.]

diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index c6e26d2b25..1fee14e450 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -138,6 +138,7 @@
 ;file \plugins\StatusPlugins\StartupStatus\options.cpp

 [<last>]

 [<current>]

+[<unknown>]

 [Left]

 [Right]

 [None]

diff --git a/langpacks/english/Plugins/Tipper.txt b/langpacks/english/Plugins/Tipper.txt
index 47eda88618..25ae436970 100644
--- a/langpacks/english/Plugins/Tipper.txt
+++ b/langpacks/english/Plugins/Tipper.txt
@@ -189,7 +189,7 @@
 [Name:]

 [Number of received messages]

 [Number of msg [IN]:]

-[Number of sended messages]

+[Number of sent messages]

 [Number of msg [OUT]:]

 [Contact time]

 [Time:]