langpacks/english: update

langpacks: update (patch from RMN)

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

7 files changed, 5 insertions, 74 deletions

diff --git a/langpacks/ukrainian/Untranslated/KeyboardNotify.txt b/langpacks/ukrainian/Untranslated/KeyboardNotify.txt
index 400a6afe03..00cc3dc1c0 100644
--- a/langpacks/ukrainian/Untranslated/KeyboardNotify.txt
+++ b/langpacks/ukrainian/Untranslated/KeyboardNotify.txt
@@ -1,7 +1,6 @@
 [Num Lock]

 [Caps Lock]

 [Scroll Lock]

-[In sequence]

 [OK]

 [Num]

 [Caps]

diff --git a/langpacks/ukrainian/Untranslated/ListeningTo.txt b/langpacks/ukrainian/Untranslated/ListeningTo.txt
index 6e2558385d..c2884f92e3 100644
--- a/langpacks/ukrainian/Untranslated/ListeningTo.txt
+++ b/langpacks/ukrainian/Untranslated/ListeningTo.txt
@@ -1,13 +1,5 @@
-[For protocols that don't support listening to but support XStatus:]

-[Winamp (*)]

+[Winamp (*)]

 [iTunes]

 [mRadio]

-[%type% - Media type (Music, Radio, Video, etc.)]

-[%listening% - Listening to info (as set above)]

-[Listening info as set in the options]

-[Media type: Music, Video, etc.]

-[Song genre]

-[Song length]

-[<Nothing is playing now>]

 [Miranda ListeningTo receiver]

 [Miranda ListeningTo WMP receiver]

diff --git a/langpacks/ukrainian/Untranslated/LotusNotify.txt b/langpacks/ukrainian/Untranslated/LotusNotify.txt
deleted file mode 100644
index ffebcc4f18..0000000000
--- a/langpacks/ukrainian/Untranslated/LotusNotify.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-[Set popup colors]

-[Clear popups history]

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

-[LotusNotify.dll cannot work with 64bit Miranda. (Lotus client is 32bit only)]

diff --git a/langpacks/ukrainian/Untranslated/MetaContacts.txt b/langpacks/ukrainian/Untranslated/MetaContacts.txt
index 08055db767..a9e73426d1 100644
--- a/langpacks/ukrainian/Untranslated/MetaContacts.txt
+++ b/langpacks/ukrainian/Untranslated/MetaContacts.txt
@@ -1,5 +1,4 @@
 [&OK]

-[Either there is no MetaContact in the database (in this case you should first convert a contact into one)\nor there is none that can host this contact.\nAnother solution could be to convert this contact into a new MetaContact.\n\nConvert this contact into a new MetaContact?]

 [ID]

 [Meta ID]

-[Sender]

+[Meta ID: ]

diff --git a/langpacks/ukrainian/Untranslated/MirFox.txt b/langpacks/ukrainian/Untranslated/MirFox.txt
index 9eaf88ec3b..17c723617a 100644
--- a/langpacks/ukrainian/Untranslated/MirFox.txt
+++ b/langpacks/ukrainian/Untranslated/MirFox.txt
@@ -1,28 +1 @@
-[Send to contact action]

-[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)]

-[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]

-[MirFox/Notification]

-[MirFox/Error]

-[just send message]

-[send message and open message window]

-[show message window with pasted message]

-[MirFox log]

-[Message sent to %s (%s)]

-[Message sent]

-[MirFox]

-[Cannot send message to %s (%s) - %S]

-[Cannot send message - %S]

-[Cannot send message to %s (%s)]

-[MirFox error]

-[Status message set on %s]

-[Status message set]

-[Cannot set status message on %s]

-[Cannot set status message]

-[This MirFox (Miranda) plugin is too old. Please update it.]

-[MirFox (Miranda) - Error]

-[This MirFox (Miranda) plugin cannot start because some other MirFox component is too old. Please, check and update your MirFox components.]

+[MirFox]

diff --git a/langpacks/ukrainian/Untranslated/MirandaG15.txt b/langpacks/ukrainian/Untranslated/MirandaG15.txt
index 40ee4b378c..2ab14e0fa6 100644
--- a/langpacks/ukrainian/Untranslated/MirandaG15.txt
+++ b/langpacks/ukrainian/Untranslated/MirandaG15.txt
@@ -1,19 +1,6 @@
-[Provides an interface to use Miranda from the LCD of various Logitech devices.]

-[Show seconds in timestamps]

-[Credits]

+[Credits]

 [Mirandag15 + TrillianG15]

 [For updates and news check the thread on http://www.g15forums.com]

 [mail@mkleinhans.de]

 [© 2006 by Martin Kleinhans]

-[Skip driver missing notification]

-[Notifications]

-[Protocol status changes]

-[When a chat session is active, skip the following notifications for that contact:]

-[Chat session specific]

-[Cut off nicknames after]

-[Don't skip when replying]

-[Cut off channel names after]

-[Show line break indicators]

-[Send messages with return, insert line breaks with ctrl+return]

 [MirandaG15]

-[Chat sessions]

diff --git a/langpacks/ukrainian/Untranslated/NimContact.txt b/langpacks/ukrainian/Untranslated/NimContact.txt
index 03cbe3f394..f77509212f 100644
--- a/langpacks/ukrainian/Untranslated/NimContact.txt
+++ b/langpacks/ukrainian/Untranslated/NimContact.txt
@@ -1,10 +1,5 @@
-[Non-IM Contact allows you to add 'contacts' that can act as shortcuts to other programs, or links to web pages.\r\nThe contacts name can be read from a text file (includes any ASCII file).\r\nThis plugin is a combination of Favorites and Text Reader plugins both made by me)]

-[URL]

-[contact display info]

-[other settings]

-[Link Settings]

+[contact display info]

 [Timer Intervals.  ]

-[Timer interval (in seconds)]

 [line()]

 [start()]

 [end()]

@@ -13,17 +8,7 @@
 [file()]

 [filename()]

 [OK]

-[Copy / Export contact]

-[Timer intervals... Non-IM Contact Protocol timer is %d seconds]

 [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]

-[Copy Contact]

-[Edit Non-IM Contact "%s"]

-[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]

-[Main Icon]

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

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

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