- langpacks/english: update;

- langpacks/russian: update;


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

10 files changed, 37 insertions, 33 deletions

diff --git a/langpacks/english/Plugins/AIM.txt b/langpacks/english/Plugins/AIM.txt
index 356c310a2d..697dd4d997 100644
--- a/langpacks/english/Plugins/AIM.txt
+++ b/langpacks/english/Plugins/AIM.txt
@@ -153,7 +153,7 @@
 [%s Client-to-client connection]

 ;file \protocols\AimOscar\src\server.cpp

 [[Auto-Response]:]

-[Contact tried to open an audio/video conference (currently not supported)]

+[Contact tried to open an audio/video conference (not currently supported)]

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

diff --git a/langpacks/english/Plugins/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt
index 2e65f0dd8a..089288b414 100644
--- a/langpacks/english/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/english/Plugins/AdvancedAutoAway.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: AdvancedAutoAway.dll

 ;  Plugin: Advanced Auto Away

-;  Version: 0.8.0.42

+;  Version: 0.8.1.0

 ;  Authors: P Boon

 ;============================================================

 [An Auto Away module with some more options than the original.]

@@ -23,18 +23,19 @@
 [Cancel]

 [Profile]

 [Message]

+[Account]

+[Set]

+[when full-screen mode is active]

+[when screen saver engages]

+[when workstation is locked]

 [after]

 [minutes of inactivity]

 [minutes of level 1 mode]

-[Confirm resetting status]

-[Account]

-[Only set if current status is]

+[only set when inactive]

 [Monitor Miranda's activity only]

 [Reset status on return]

-[when screen saver engages]

-[Set]

-[only set when inactive]

-[when workstation is locked]

+[Confirm resetting status]

+[Only set if current status is]

 [Command line]

 [OK]

 [Copy to clipboard]

diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt
index e8c765ebd7..5b6b634291 100644
--- a/langpacks/english/Plugins/CmdLine.txt
+++ b/langpacks/english/Plugins/CmdLine.txt
@@ -37,7 +37,7 @@
 [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.]

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

diff --git a/langpacks/english/Plugins/Folders.txt b/langpacks/english/Plugins/Folders.txt
index 107f82de35..8c8f18fb15 100644
--- a/langpacks/english/Plugins/Folders.txt
+++ b/langpacks/english/Plugins/Folders.txt
@@ -26,7 +26,7 @@
 [Expands to your profile path - the value found in mirandaboot.ini,]

 [ProfileDir section (usually inside Miranda's folder).]

 [Expands to your current profile name without the extenstion.]

-[(e.g.default if your your profile is default.dat).]

+[(e.g. default if your your profile is default.dat).]

 [Environment variables]

 [The plugin can also expand environment variables; the variables are specified like in any other]

 [program that can use environment variables, i.e. %<env variable>%.]

@@ -35,7 +35,7 @@
 [instead of expanding to Miranda's profile path.]

 [Examples:]

 [If the value for the ProfileDir inside mirandaboot.ini, ProfileDir section is '.\\profiles\', current]

-[profile is 'default.dat' and Miranda's path is 'c:\\program files\\miranda ng\' then:]

+[profile is 'default.dat' and Miranda path is 'c:\\program files\\miranda ng\' then:]

 [will expand to 'c:\\program files\\miranda ng']

 [will expand to 'c:\\program files\\miranda ng\\profiles']

 [will expand to 'default']

diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index a39f0f3f52..fc25f740d5 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -23,18 +23,19 @@
 [Cancel]

 [Profile]

 [Message]

+[Account]

+[Set]

+[when full-screen mode is active]

+[when screen saver engages]

+[when workstation is locked]

 [after]

 [minutes of inactivity]

 [minutes of level 1 mode]

-[Confirm resetting status]

-[Account]

-[Only set if current status is]

+[only set when inactive]

 [Monitor Miranda's activity only]

 [Reset status on return]

-[when screen saver engages]

-[Set]

-[only set when inactive]

-[when workstation is locked]

+[Confirm resetting status]

+[Only set if current status is]

 [Command line]

 [OK]

 [Copy to clipboard]

diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index d9fb6a882d..332143c826 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -70,7 +70,7 @@
 [User &details]

 [User &history]

 ;file \protocols\MSN\src\msn_commands.cpp

-[Contact tried to open an audio conference (currently not supported)]

+[Contact tried to open an audio conference (not currently supported)]

 [%I64u bytes]

 [Accept NetMeeting request from %s?]

 [MSN Protocol]

@@ -139,8 +139,8 @@
 [Server list]

 [Notifications]

 ;file \protocols\MSN\src\msn_p2p.cpp

-[Contact tried to send its webcam data (currently not supported)]

-[Contact tried to view our webcam data (currently not supported)]

+[Contact tried to send its webcam data (not currently supported)]

+[Contact tried to view our webcam data (not currently supported)]

 ;file \protocols\MSN\src\msn_proto.cpp

 [Live Mail]

 [Live Alert]

diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index ddf182abdc..047c3c62bb 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -173,6 +173,7 @@
 [Filtering]

 [Message log]

 ;file \plugins\NewXstatusNotify\src\popup.h

+[(was %s)]

 [Open message window]

 [Close popup]

 [Open contact details window]

diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index cd9ad71934..cf3c0127d5 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -23,18 +23,19 @@
 [Cancel]

 [Profile]

 [Message]

+[Account]

+[Set]

+[when full-screen mode is active]

+[when screen saver engages]

+[when workstation is locked]

 [after]

 [minutes of inactivity]

 [minutes of level 1 mode]

-[Confirm resetting status]

-[Account]

-[Only set if current status is]

+[only set when inactive]

 [Monitor Miranda's activity only]

 [Reset status on return]

-[when screen saver engages]

-[Set]

-[only set when inactive]

-[when workstation is locked]

+[Confirm resetting status]

+[Only set if current status is]

 [Command line]

 [OK]

 [Copy to clipboard]

diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt
index c7dd9ff6e8..ff120d2b2d 100644
--- a/langpacks/english/Plugins/Twitter.txt
+++ b/langpacks/english/Plugins/Twitter.txt
@@ -11,11 +11,11 @@
 [Create a new Twitter account]

 [Default group:]

 [Username:]

-[[Sign in to link your Twitter account]]

+[<Sign in to link your Twitter account>]

 [Send Tweet]

 [Send]

 [Cancel]

-[Misc. Options]

+[Miscellaneous options]

 [Use group chat for Twitter feed]

 [Base URL:]

 [Polling rate:]

@@ -23,7 +23,7 @@
 [sec]

 [Please cycle your connection for these changes to take effect]

 [Treat tweets as messages]

-[Enable popup notifications for Tweets]

+[Enable popup notifications for tweets]

 [Colors]

 [Use Windows colors]

 [Use Popup colors]

diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index fcd084e485..d951627303 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -230,7 +230,7 @@
 [Retry]

 [Yes]

 [No]

-[Abord]

+[Abort]

 [Ignore]

 [Error]

 ;file \plugins\UserInfoEx\src\dlg_propsheet.cpp