langpacks/english: updated

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

8 files changed, 25 insertions, 30 deletions

diff --git a/langpacks/english/Plugins/AIM.txt b/langpacks/english/Plugins/AIM.txt
index feb754bfcb..356c310a2d 100644
--- a/langpacks/english/Plugins/AIM.txt
+++ b/langpacks/english/Plugins/AIM.txt
@@ -157,7 +157,7 @@
 [No information has been provided by the server.]

 [Item you want to delete not found in list.]

 [Failed to add buddy to list: Item already exist.]

-[Error adding buddy(invalid ID or already in list?)]

+[Error adding buddy (invalid ID or already in list?)]

 [Cannot add buddy. Limit for this type of item exceeded.]

 [Error? Attempting to add ICQ contact to an AIM list.]

 [Cannot add this buddy because it requires authorization.]

diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt
index aee2713b09..01cb5d8e0c 100644
--- a/langpacks/english/Plugins/CmdLine.txt
+++ b/langpacks/english/Plugins/CmdLine.txt
@@ -12,34 +12,34 @@
 [Miranda has been closed or an error has occurred while waiting for the result, could not process request.]

 ;file \plugins\CmdLine\MimCmd\src\MimCmd.cpp

 [%s usage:\n]

-[%s <command> [<param> [, <param> ..]]\n]

+[%s <command> [<param> [<param> [...]]].\n]

 [This will tell Miranda to run the specified command. The commands can have zero, one or more parameters. Use '%s help' to get a list of possible commands.\n]

-[No command can have more than %d parameters\n]

+[No command can have more than %d parameters.\n]

 [%s version %s]

 [Unknown command '%s'.\n]

 ;file \plugins\CmdLine\src\CmdLine.cpp

 [Could not initialize CmdLine plugin property]

 [Error]

 ;file \plugins\CmdLine\src\mimcmd_data.h

-[Change account status either globally or per account.\nUsage: status <status> [<account>].\nPossible values for <status> are: offline, online, away, dnd, na, occupied, freechat, invisible, onthephone, outtolunch.\n<Account> is the name of the account. If it's not specified then the command will issue a global status change.]

-[Change away message either globally or per account.\nUsage: awaymsg <message> [<account>].\n<Message> is the new away message.\n<Account> is an optional parameter specifying the account to set the away message for. If not specified then the away message will be set globally.]

-[Change extended status either globally or per account.\nUsage xstatus <status> [<account>].\n<XStatus> is the new extended status to set. Possible values are:...\n<Account> is an optional parameter specifying the account for which extended status is set. If not specified then extended status for all accounts will be changed.\nNOTE: Not all accounts/protocols support extended status.]

-[Disables or enables popups display.\nUsage popups (disable | enable | toggle).\nThe command will either enable or disable popups display.]

+[Changes account status either globally or per account.\nUsage: status <status> [<account>].\nPossible values for <status> are: offline, online, away, dnd, na, occupied, freechat, invisible, onthephone, outtolunch.\n<Account> is the name of the account. If it's not specified then the command will issue a global status change.]

+[Changes away message either globally or per account.\nUsage: awaymsg <message> [<account>].\n<Message> is the new away message.\n<Account> is an optional parameter specifying the account to set the away message for. If not specified then the away message will be set globally.]

+[Changes extended status either globally or per account.\nUsage: xstatus <status> [<account>].\n<XStatus> is the new extended status to set. Possible values are:...\n<Account> is an optional parameter specifying the account for which extended status is set. If not specified then extended status for all accounts will be changed.\nNOTE: Not all accounts/protocols support extended status.]

+[Disables or enables popups display.\nUsage: popups (disable | enable | toggle).\nThe command will either enable or disable popups display.]

 [Disables or enables sounds.\nUsage: sounds (disable | enable | toggle).\nThe command will either disable or enable sounds.]

 [Hides or shows the contact list window.\nUsage: clist (show | hide | toggle).\nThe command will either show or hide the contact list window.]

-[Closes Miranda.\nUsage: quit [wait]. If wait is used then the command will return only when CmdLine plugin has been unloaded by Miranda.]

+[Closes Miranda.\nUsage: quit [wait].\nIf wait is used then the command will return only when CmdLine plugin has been unloaded by Miranda.]

 [Provides help on other commands.\nUsage: help [<command>].\nThe command will print help information for other commands. If run without any parameters it will print available commands.]

-[Notifies Exchange plugin to check for email.\nUsage: exchange check]

+[Notifies Exchange plugin to check for email.\nUsage: exchange check.]

 [Notifies YAMN plugin to check for email.\nUsage: yamn check.]

-[Calls a Miranda service.\nUsage: callservice <service> (d|s)<wParam> (d|s)<lParam>. The command will call Miranda <service> service using wParam and lParam as arguments; the first letter of the paramater must be either 'd' if the parameter is a decimal number or 's' if the parameter is a string. Be careful when you use this function as you can only pass numbers and strings as data.\nNOTE:If you pass invalid data to a service Miranda might crash.]

-[Sends a message to the specified contact(s).\nUsage: message <contact> [<contact> [<contact> [...]]] <message>. The command will send <message> to the specified contact(s) - at least one contact must be specified - all parameters except the last one are considered recipients.\n<Contact> has the following format:<name>[:<account>]. <Name> is the contact display name or unique ID and <account> is an optional parameter representing the account of the contact (useful in case there is more than one contact with the same name).\nNOTE:The message string cannot exceed 512 characters.]

-[Allows you to manage database settings.\nUsage:\n db set <module> <name> (b|i|d|s|w)<value>\n  db delete <module> <name>\n  db get <module> <name>.\nThe command can set a database entry to the specified value (if the entry does not exist it will be created) as well as read or delete a specified database entry. <Module> is the name of the module where the key should be located, <name> is the name of the key and <value> is the value to be written. A character must be placed before <value> in order to specify what kind of data to write: b - byte, i - integer (word), d - double word, s - string, w - wide string.]

-[Configures proxy settings either globally or per account.\nUsage: proxy (global|<account>) <setting> [<params>].\n  <setting> is one of the following settings:\n    status (disable | enable | toggle).\n    server <proxy type> <server> <port>]

-[Allows you to search/list contacts or open a message windows for specified contacts.\nUsage:\n contacts list [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]]. The command will search all contacts and display the ones matching the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'.\n contacts open [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]]. The command will open a message window for all contacts that match the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'. If no keyword is specified the command will open a message window for all contacts that have unread messages.]

-[Shows history or unread messages for a contact.\nUsage:\n history <command> <contact>.\n <command> is one of the following commands:\n    unread - show unread messages for that contact.\n    show <contact> <start> <finish> - show history from event number <start> to <finish>. If any number is negative it is interpreted as a relative index from the last event number + 1 (so the last event for a contact is -1).]

-[Shows version information for Miranda and CmdLine plugin. If VersionInfo plugin is installed it will use its report instead.\nUsage:\n version. The command will print Miranda's and CmdLine's version numbers or, if VersionInfo plugin is installed, it will show VersionInfo's report.]

-[Changes the user's nickname on the given protocol to the new name.\nUsage:\n setnickname <protocol> new_nickname]

-[Ignores or removes ignore flags for specific contacts.\nUsage:\n ignore (block | unblock) <contact> [<contact> [<contact> [..]]]. Ignores or removes ignore flags for the specified contacts.]

+[Calls a Miranda service.\nUsage: callservice <service> (d|s)<wParam> (d|s)<lParam>.\nThe command will call Miranda <service> service using wParam and lParam as arguments; the first letter of the paramater must be either 'd' if the parameter is a decimal number or 's' if the parameter is a string. Be careful when you use this function as you can only pass numbers and strings as data.\nNOTE: If you pass invalid data to a service Miranda might crash.]

+[Sends a message to the specified contact(s).\nUsage: message <contact> [<contact> [<contact> [...]]] <message>.\nThe command will send <message> to the specified contact(s) - at least one contact must be specified - all parameters except the last one are considered recipients.\n<Contact> has the following format: <name>[:<account>]. <Name> is the contact display name or unique ID and <account> is an optional parameter representing the account of the contact (useful in case there is more than one contact with the same name).\nNOTE: The message string cannot exceed 512 characters.]

+[Allows you to manage database settings.\nUsage:\n  db set <module> <name> (b|i|d|s|w)<value>\n  db delete <module> <name>\n  db get <module> <name>.\nThe command can set a database entry to the specified value (if the entry does not exist it will be created) as well as read or delete a specified database entry. <Module> is the name of the module where the key should be located, <name> is the name of the key and <value> is the value to be written. A character must be placed before <value> in order to specify what kind of data to write: b - byte, i - integer (word), d - double word, s - string, w - wide string.]

+[Configures proxy settings either globally or per account.\nUsage: proxy (global|<account>) <setting> [<params>].\n<Setting> is one of the following settings:\n  status (disable | enable | toggle)\n  server <proxy type> <server> <port>.]

+[Allows you to search/list contacts or open a message windows for specified contacts.\nUsage:\n  contacts list [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]].\nThe command will search all contacts and display the ones matching the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'.\n  contacts open [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]].\nThe command will open a message window for all contacts that match the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'. If no keyword is specified the command will open a message window for all contacts that have unread messages.]

+[Shows history or unread messages for a contact.\nUsage: history <command> <contact>.\n<Command> is one of the following commands:\n  unread - show unread messages for that contact.\n  show <contact> <start> <finish> - show history from event number <start> to <finish>. If any number is negative it is interpreted as a relative index from the last event number +1 (so the last event for a contact is -1).]

+[Shows version information for Miranda and CmdLine plugin. If VersionInfo plugin is installed it will use its report instead.\nUsage: version.\nThe command will print Miranda's and CmdLine's version numbers or, if VersionInfo plugin is installed, it will show VersionInfo's report.]

+[Changes the user's nickname on the given protocol to the new name.\nUsage: setnickname <protocol> new_nickname.]

+[Ignores or removes ignore flags for specific contacts.\nUsage:\n ignore (block | unblock) <contact> [<contact> [<contact> [..]]].\nThe command will set or remove ignore flags for the specified contacts]

 ;file \plugins\CmdLine\src\mimcmd_handlers.cpp

 [Command '%s' is not currently supported.]

 [Wrong number of parameters for command '%s'.]

diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt
index bd77c4b98b..de813f6a69 100644
--- a/langpacks/english/Plugins/Db_autobackups.txt
+++ b/langpacks/english/Plugins/Db_autobackups.txt
@@ -34,12 +34,10 @@
 [Database backups]

 [Backup folder]

 [Database]

-[Backup Profile]

-[Save Profile As...]

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

 [path to Miranda root folder]

-[path to current miranda profile]

-[name of current miranda profile (filename, without extension)]

+[path to current Miranda profile]

+[name of current Miranda profile (filename, without extension)]

 [will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]

 [same as environment variable %APPDATA% for currently logged-on Windows user]

 [username for currently logged-on Windows user]

@@ -50,6 +48,5 @@
 [Days]

 [Hours]

 [Minutes]

-[Select Backup Folder]

+[Select backup folder]

 [Error creating backup folder]

-[Database AutoBackups]

diff --git a/langpacks/english/Plugins/FavContacts.txt b/langpacks/english/Plugins/FavContacts.txt
index 09e1de8946..4cf8f8d946 100644
--- a/langpacks/english/Plugins/FavContacts.txt
+++ b/langpacks/english/Plugins/FavContacts.txt
@@ -30,8 +30,6 @@
 ;file \plugins\FavContacts\src\main.cpp

 [Favorite Contact]

 [Regular Contact]

-[<No group>]

-[Favourite Contacts]

 [Contact name]

 [Second line]

 [Selected contact name (color)]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 9070f91f4a..2a96d2c7cf 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -436,7 +436,7 @@
 [nick of current contact (if defined)]

 [protocol name of current contact (if defined). Account name is used when protocol supports multiaccounts]

 [User ID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc.]

-[path to root miranda folder]

+[path to Miranda root folder]

 [path to current miranda profile]

 [name of current miranda profile (filename, without extension)]

 [will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 0c584b3907..c6dc8e03ed 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -1105,7 +1105,7 @@
 [nick of current contact (if defined)]

 [protocol name of current contact (if defined). Account name is used when protocol supports multiaccounts]

 [User ID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc.]

-[path to root miranda folder]

+[path to Miranda root folder]

 [path to current miranda profile]

 [name of current miranda profile (filename, without extension)]

 [will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index bc43b2a02e..0f099fa15e 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -7,7 +7,7 @@
 ;============================================================

 [VKontakte protocol support for Miranda NG.]

 ;file \protocols\VKontakte\res\resource.rc

-[Login or phone number:]

+[E-mail or phone number:]

 [Password:]

 [Open VK site]

 [Bots Challenge Test]

diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt
index 0926d354dd..0faaa8ae9a 100644
--- a/langpacks/english/Plugins/Variables.txt
+++ b/langpacks/english/Plugins/Variables.txt
@@ -94,7 +94,7 @@
 [get the 'most online' subcontact x]

 ;file \plugins\Variables\src\parse_miranda.cpp

 [Miranda Core Global]

-[path to root miranda folder]

+[path to Miranda root folder]

 [path to current miranda profile]

 [name of current miranda profile (filename, without extension)]

 [will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]