MirandaG15: proper version info, russian MirandaG15.txt is moved back grom Deprecated

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

6 files changed, 146 insertions, 31 deletions

diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt
index 01cb5d8e0c..e8c765ebd7 100644
--- a/langpacks/english/Plugins/CmdLine.txt
+++ b/langpacks/english/Plugins/CmdLine.txt
@@ -23,7 +23,7 @@
 ;file \plugins\CmdLine\src\mimcmd_data.h

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

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

@@ -39,7 +39,7 @@
 [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]

+[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/MirandaG15.txt b/langpacks/english/Plugins/MirandaG15.txt
new file mode 100644
index 0000000000..99593b26d5
--- /dev/null
+++ b/langpacks/english/Plugins/MirandaG15.txt
@@ -0,0 +1,112 @@
+#muuid {798221e1-e47a-4dc8-9077-1e576f9c4307}

+;============================================================

+;  File: MirandaG15.dll

+;  Plugin: MirandaG15

+;  Version: 0.1.2.0

+;  Authors: Martin Kleinhans

+;============================================================

+[Provides an interface to use Miranda from the LCD of various Logitech devices.]

+;file \plugins\MirandaG15\res\MirandaG15.rc

+[Fonts]

+[General settings]

+[Show softkey labels]

+[Event log:]

+[Sample]

+[Message log:]

+[Contact list:]

+[Titles:]

+[Notifications:]

+[Turn off backlights]

+[If the applet is active:]

+[Use the VolumeWheel to scroll up and down (might affect system performance)]

+[Show seconds in timestamps]

+[Use transition effects when changing screens]

+[Credits]

+[About]

+[Mirandag15 + TrillianG15]

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

+[Or visit http://www.mkleinhans.de]

+[mail@mkleinhans.de]

+[© 2006 by Martin Kleinhans]

+[Device:]

+[If the screensaver is active:]

+[Lock the screen]

+[Skip driver missing notification]

+[Notifications]

+[Notification screen title]

+[Hide it]

+[Show the plugin name]

+[Show a short event summary]

+[Size of the log]

+[Notification duration]

+[events]

+[seconds]

+[Notification types]

+[Incoming messages]

+[Contact signs off]

+[Contact changes status]

+[Incoming URL]

+[Contact list events]

+[Incoming file transfers]

+[Protocol disconnected]

+[Protocol connected]

+[Protocol status changes]

+[Show only events from the following protocols:]

+[Contact signs on]

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

+[Chat session specific]

+[Show timestamps]

+[Messages]

+[User events]

+[Emotes]

+[Status changes]

+[Special IRC events:]

+[Notices]

+[Channel events]

+[Cut off nicknames after]

+[chars]

+[Show protocol labels]

+[Don't skip when replying]

+[Exceptions:]

+[Cut off channel names after]

+[Contact list]

+[Show the contacts protocols]

+[Hide offline users]

+[Use ignore settings]

+[Use groups/subgroups]

+[Grouped mode]

+[Draw tree lines]

+[Show counters behind group names]

+[Reset selection]

+[When opening the contact list screen:]

+[Don't change group states]

+[Collapse all groups]

+[Show only contacts from the following protocols:]

+[Protocol filter]

+[Expand all groups]

+[Use two columns]

+[Fade out selection rectangle]

+[Chat]

+[Typing notifications]

+[Show typing notifications]

+[Send typing notifications]

+[Maximizing]

+[When maximized:]

+[Hide title]

+[Hide labels]

+[Show only new messages]

+[Mark incoming messages as read]

+[Maximized scrolling]

+[Size of the log:]

+[On incoming messages:]

+[Do nothing]

+[Scroll to the first line]

+[Scroll to the last line]

+[Replying]

+[Show line break indicators]

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

+[Maximized replying]

+[Close chat after]

+[When in background]

+;file \plugins\MirandaG15\src\CConfig.cpp

+[No device attached]

diff --git a/langpacks/english/Plugins/StartupSilence.txt b/langpacks/english/Plugins/StartupSilence.txt
index 7cb1abafe3..c2d9229525 100644
--- a/langpacks/english/Plugins/StartupSilence.txt
+++ b/langpacks/english/Plugins/StartupSilence.txt
@@ -35,7 +35,9 @@
 [Toggle Silence OFF TTB]

 [Toggle Silence ON TTB]

 [Sounds and popups are enabled]

+[Filtered mode On]

 [Sounds and popups are disabled temporarily]

+[Sounds and popups are disabled temporarily\nAllow mRadio or Weather popups, etc...]

 [Silent Startup mode changed to ON]

 [Silent Startup mode changed to OFF]

 [Silence At Startup is ON]

diff --git a/langpacks/english/Plugins/Tipper.txt b/langpacks/english/Plugins/Tipper.txt
index 25ae436970..cac9d20433 100644
--- a/langpacks/english/Plugins/Tipper.txt
+++ b/langpacks/english/Plugins/Tipper.txt
@@ -70,7 +70,7 @@
 [characters]

 [Disable in invisible status]

 [Skins]

-[Opacity(%):]

+[Opacity (%):]

 [Transparency]

 [Effects]

 [Border]

diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt
index 8b556ed050..16e46b9920 100644
--- a/langpacks/english/Plugins/YAMN.txt
+++ b/langpacks/english/Plugins/YAMN.txt
@@ -14,40 +14,40 @@
 [Copyright:]

 [Contact:]

 [WWW:]

-[Check this account]

-[Check interval [min]:]

-[Notifications]

-[Sound]

-[Message]

-[Tray Icon]

-[Keyboard Flash]

-[Execute Application]

-[Use contact notification for this account]

-[Replace nick name]

-[Disable Events]

+[Account]

+[Name:]

 [Server:]

+[Port:]

+[SSL]

+[APOP]

 [User Name:]

 [Password:]

 [Codepage:]

-[Port:]

-[SSL]

+[Default]

 [Disable STLS]

+[Status:]

+[Options]

+[Check this account]

 [Startup check]

+[Check interval [min]:]

+[Only check when...]

 [Auto retrieve body]

 [Check from menu]

-[Only check when...]

+[Use contact notification for this account]

+[Replace nick name]

+[Disable Events]

+[Notifications]

+[New Mail]

+[Sound]

+[Message]

+[Keyboard Flash]

+[Tray Icon]

+[Execute Application]

+[Errors]

 [Sound notification if failed]

 [Message notification if failed]

 [Tray icon notification if failed]

 [Reset counter]

-[Default]

-[Status:]

-[Account]

-[APOP]

-[Name:]

-[Options]

-[New Mail]

-[Errors]

 [Check while...]

 [Cancel]

 [Choose modes]

diff --git a/langpacks/russian/Deprecated/MirandaG15.txt b/langpacks/russian/Plugins/MirandaG15.txt
index b60cba96fd..fbe8e1eb93 100644
--- a/langpacks/russian/Deprecated/MirandaG15.txt
+++ b/langpacks/russian/Plugins/MirandaG15.txt
@@ -1,8 +1,9 @@
-;============================================================

+#muuid {798221e1-e47a-4dc8-9077-1e576f9c4307}

+;============================================================

 ;  File: MirandaG15.dll

-;  Module: Use Miranda with your Logitech G15

-;  Versions: 1.1.14

-;  URL: http://addons.miranda-im.org/details.php?action=viewfile&id=2610

+;  Plugin: MirandaG15

+;  Version: 0.1.2.0

+;  Authors: Martin Kleinhans

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

 [Timeout: No response from contact/server]

 Таймаут: Нет ответа от контакта/сервера

@@ -227,5 +228,5 @@
 Отправка сообщений по Enter, перевод строки по CTRL+Enter)

 [Maximized replying]

 Ответ в режиме полного экрана

-[Provides an interface to use Miranda from the G15's LCD]

-Плагин добавляет возможность использования Miranda IM на ЖК-экране клавиатуры Logitech G15
\ No newline at end of file
+[Provides an interface to use Miranda from the LCD of various Logitech devices.]

+Плагин добавляет возможность использования Miranda NG на ЖК-экране различных устройств Logitech.
\ No newline at end of file