- langpacks/english: update;

- langpacks/russian: update;


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

6 files changed, 72 insertions, 178 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 3b437e4788..44aeb05712 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -657,41 +657,13 @@
 [Join chat]

 [Open chat window]

 ;file \src\core\stdchat\src\colorchooser.cpp

-;file \src\core\stdchat\src\log.cpp

-[%s has joined]

-[You have joined %s]

-[%s has left]

-[%s has disconnected]

-[%s is now known as %s]

-[You are now known as %s]

-[%s kicked %s]

-[Notice from %s: ]

-[The topic is '%s%s']

-[ (set by %s on %s)]

-[ (set by %s)]

-[%s enables '%s' status for %s]

-[%s disables '%s' status for %s]

-[<invalid>]

+;file \src\core\stdchat\src\main.cpp

+[Chat module]

+[Message background]

+[User list background]

+[User list lines]

+[User list background (selected)]

 ;file \src\core\stdchat\src\options.cpp

-[Others nicknames]

-[Your nickname]

-[User has joined]

-[User has left]

-[User has disconnected]

-[User kicked ...]

-[User is now known as ...]

-[Notice from user]

-[Incoming message]

-[Outgoing message]

-[The topic is ...]

-[Information messages]

-[User enables status for ...]

-[User disables status for ...]

-[Action message]

-[Highlighted message]

-[Message typing area]

-[User list members (online)]

-[User list members (away)]

 [Use a tabbed interface]

 [Close tab on double click]

 [Restore previously open tabs when showing the window]

@@ -770,11 +742,6 @@
 [Show popup for name changes]

 [Show popup for information messages]

 [Show popup for status changes]

-[Chat module]

-[Message background]

-[User list background]

-[User list lines]

-[User list background (selected)]

 [Window icon]

 [Bold]

 [Italics]

@@ -823,33 +790,7 @@
 [Chat log]

 [Chat]

 [Popups]

-[Message is highlighted]

-[User has performed an action]

-[User has kicked some other user]

-[User's status was changed]

-[User has changed name]

-[User has sent a notice]

-[The topic has been changed]

-;file \src\core\stdchat\src\services.cpp

-[&Join]

 ;file \src\core\stdchat\src\tools.cpp

-[%s wants your attention in %s]

-[%s speaks in %s]

-[%s has joined %s]

-[%s has left %s]

-[%s kicked %s from %s]

-[Notice from %s]

-[Topic change in %s]

-[Information in %s]

-[%s enables '%s' status for %s in %s]

-[%s disables '%s' status for %s in %s]

-[%s says: %s]

-[%s has left (%s)]

-[%s has disconnected (%s)]

-[%s kicked %s (%s)]

-[Notice from %s: %s]

-[The topic is '%s']

-[The topic is '%s' (set by %s)]

 [Look up '%s':]

 [No word to look up]

 [&Message %s]

@@ -1006,6 +947,8 @@
 [An unknown error has occurred.]

 ;file \src\core\stduihist\history.cpp

 [Invalid message]

+[Outgoing message]

+[Incoming message]

 [Outgoing URL]

 [Incoming URL]

 [Outgoing file]

@@ -1051,10 +994,66 @@
 [Add contact]

 [Please authorize my request and add me to your contact list.]

 ;file \src\modules\chat\chat_opts.cpp

+[Others nicknames]

+[Your nickname]

+[User has joined]

+[User has left]

+[User has disconnected]

+[User kicked ...]

+[User is now known as ...]

+[Notice from user]

+[The topic is ...]

+[Information messages]

+[User enables status for ...]

+[User disables status for ...]

+[Action message]

+[Highlighted message]

+[Message typing area]

+[User list members (online)]

+[User list members (away)]

+[Message is highlighted]

+[User has performed an action]

+[User has kicked some other user]

+[User's status was changed]

+[User has changed name]

+[User has sent a notice]

+[The topic has been changed]

 ;file \src\modules\chat\chat_svc.cpp

+[&Join]

 ;file \src\modules\chat\clist.cpp

 ;file \src\modules\chat\log.cpp

+[%s has joined]

+[You have joined %s]

+[%s has left]

+[%s has disconnected]

+[%s is now known as %s]

+[You are now known as %s]

+[%s kicked %s]

+[Notice from %s: ]

+[The topic is '%s%s']

+[ (set by %s on %s)]

+[ (set by %s)]

+[%s enables '%s' status for %s]

+[%s disables '%s' status for %s]

+[<invalid>]

 ;file \src\modules\chat\tools.cpp

+[%s wants your attention in %s]

+[%s speaks in %s]

+[%s has joined %s]

+[%s has left %s]

+[%s kicked %s from %s]

+[Notice from %s]

+[Topic change in %s]

+[Information in %s]

+[%s enables '%s' status for %s in %s]

+[%s disables '%s' status for %s in %s]

+[%s says: %s]

+[%s has left (%s)]

+[%s has disconnected (%s)]

+[%s kicked %s (%s)]

+[Notice from %s: %s]

+[The topic is '%s']

+[The topic is '%s' (set by %s)]

 ;file \src\modules\clist\clcitems.cpp

 ;file \src\modules\clist\clistmenus.cpp

 [Custom status]

diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index 37243c0fdc..b3c10d2140 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -16,8 +16,8 @@
 [Send message font color/size info inside messages]

 [Disable all contacts not included into my contact list]

 [Manage server groups]

-[Run the following application when new Hotmail arrives]

 [Allow people on my contact list send messages to mobile device]

+[Run the following application when new Hotmail arrives]

 [Connection settings]

 [Direct:]

 [Gateway:]

diff --git a/langpacks/english/Plugins/Ping.txt b/langpacks/english/Plugins/Ping.txt
index bd6fc5304a..d9bba16b1e 100644
--- a/langpacks/english/Plugins/Ping.txt
+++ b/langpacks/english/Plugins/Ping.txt
@@ -55,8 +55,6 @@
 [Hosts...]

 ;file \plugins\Ping\src\menu.cpp

 [PING]

-[Enable All Pings]

-[Disable All Pings]

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

 [Open log file]

 [All\0*.*\0Text\0*.TXT\0]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index dedad66b6d..b96b19aeef 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Scriver.dll

 ;  Plugin: Scriver

-;  Version: 2.10.1.0

+;  Version: 2.11.0.0

 ;  Authors: Miranda NG Development Team

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

 [Scriver - send and receive instant messages.]

@@ -303,29 +303,6 @@
 [Info bar contact name]

 [Info bar background]

 [Info bar status message]

-[Others nicknames]

-[Your nickname]

-[User has joined]

-[User has left]

-[User has disconnected]

-[User kicked ...]

-[User is now known as ...]

-[Notice from user]

-[Incoming message]

-[Outgoing message]

-[The topic is ...]

-[Information messages]

-[User enables status for ...]

-[User disables status for ...]

-[Action message]

-[Highlighted message]

-[Message typing area]

-[Message background]

-[User list members (online)]

-[User list background]

-[User list members (away)]

-[User list lines]

-[User list background (selected)]

 [Offline]

 [Online]

 [Away]

@@ -359,28 +336,11 @@
 [Always On Top]

 ;file \plugins\Scriver\src\sendqueue.cpp

 [The message send timed out.]

-;file \plugins\Scriver\src\chat\clist.cpp

-[Join chat]

-[Open chat window]

 ;file \plugins\Scriver\src\chat\colorchooser.cpp

-;file \plugins\Scriver\src\chat\log.cpp

-[%s has joined]

-[You have joined %s]

-[%s has left]

-[%s has disconnected]

-[%s is now known as %s]

-[You are now known as %s]

-[%s kicked %s]

-[Notice from %s]

-[The topic is '%s%s']

-[ (set by %s on %s)]

-[ (set by %s)]

-[%s enables '%s' status for %s]

-[%s disables '%s' status for %s]

-[<invalid>]

 ;file \plugins\Scriver\src\chat\main.cpp

-[&Join]

-[&Leave]

+[User list background]

+[User list lines]

+[User list background (selected)]

 ;file \plugins\Scriver\src\chat\options.cpp

 [Flash when someone speaks]

 [Flash when a word is highlighted]

@@ -467,32 +427,7 @@
 [Default events to show in new chat rooms if the 'event filter' is enabled]

 [Select Folder]

 [Popups]

-[Message is highlighted]

-[User has performed an action]

-[User has kicked some other user]

-[User's status was changed]

-[User has changed name]

-[User has sent a notice]

-[The topic has been changed]

-;file \plugins\Scriver\src\chat\services.cpp

-[Server: %s]

 ;file \plugins\Scriver\src\chat\tools.cpp

-[%s wants your attention in %s]

-[%s speaks in %s]

-[%s has joined %s]

-[%s has left %s]

-[%s kicked %s from %s]

-[Topic change in %s]

-[Information in %s]

-[%s enables '%s' status for %s in %s]

-[%s disables '%s' status for %s in %s]

-[%s says: %s]

-[%s has left (%s)]

-[%s has disconnected (%s)]

-[%s kicked %s (%s)]

-[Notice from %s: %s]

-[The topic is '%s']

-[The topic is '%s' (set by %s)]

 [&Message %s]

 ;file \plugins\Scriver\src\chat\window.cpp

 [Italic]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index ce3b9baee5..84dfa4aa0f 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: TabSRMM.dll

 ;  Plugin: TabSRMM

-;  Version: 3.2.0.1

+;  Version: 3.3.0.0

 ;  Authors: The Miranda developers team and contributors

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

 [IM and group chat module for Miranda NG.]

@@ -934,9 +934,6 @@
 [Closing options dialog|To reflect the changes done by importing a theme in the options dialog, the dialog must be closed after loading a theme \\b1 and unsaved changes might be lost\\b0 .\n\nDo you want to continue?]

 [Loading a theme|Loading a color and font theme can overwrite the settings defined by your skin.\n\nDo you want to continue?]

 [TabSRMM warning message]

-;file \plugins\TabSRMM\src\chat\clist.cpp

-[Join chat]

-[Open chat window]

 ;file \plugins\TabSRMM\src\chat\colorchooser.cpp

 [Text color]

 ;file \plugins\TabSRMM\src\chat\log.cpp

@@ -953,7 +950,7 @@
 [ (set by %s)]

 [%s enables '%s' status for %s]

 [%s disables '%s' status for %s]

-[<invalid>]

+;file \plugins\TabSRMM\src\chat\main.cpp

 ;file \plugins\TabSRMM\src\chat\muchighlight.cpp

 [Add user to highlight list]

 [Edit user highlight list]

@@ -986,24 +983,6 @@
 [Active background]

 [Hovered background]

 [Unread background]

-[Timestamp]

-[Others nicknames]

-[Your nickname]

-[User has joined]

-[User has left]

-[User has disconnected]

-[User kicked ...]

-[User is now known as ...]

-[Notice from user]

-[The topic is ...]

-[Information messages]

-[User enables status for ...]

-[User disables status for ...]

-[Action message]

-[Highlighted message]

-[Chat log symbols (Webdings)]

-[User list members (Online)]

-[User list members (away)]

 [>> Outgoing messages]

 [>> Outgoing misc events]

 [<< Incoming messages]

@@ -1125,16 +1104,6 @@
 [No markers]

 [Show as icons]

 [Show as text symbols]

-[Message is highlighted]

-[User has performed an action]

-[User has kicked some other user]

-[User's status was changed]

-[User has changed name]

-[User has sent a notice]

-[The topic has been changed]

-;file \plugins\TabSRMM\src\chat\services.cpp

-[&Join]

-[&Leave]

 ;file \plugins\TabSRMM\src\chat\tools.cpp

 [%s wants your attention in %s]

 [%s speaks in %s]

@@ -1147,12 +1116,6 @@
 [%s enables '%s' status for %s in %s]

 [%s disables '%s' status for %s in %s]

 [%s%s says:%s %s]

-[%s has left (%s)]

-[%s has disconnected (%s)]

-[%s kicked %s (%s)]

-[Notice from %s: %s]

-[The topic is '%s']

-[The topic is '%s' (set by %s)]

 [Look up '%s':]

 [No word to look up]

 [&Message %s]

diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt
index fcb76bb3a9..76e26fb49c 100644
--- a/langpacks/english/Plugins/Variables.txt
+++ b/langpacks/english/Plugins/Variables.txt
@@ -30,7 +30,6 @@
 [Variables...]

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

 [Token]

-[--- Special characters ---\r\n\r\nThe following characters have a special meaning in a formatting string:\r\n\r\n?<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will be parsed again. Example: Today is ?cdate(yyyy/MM/dd).\r\n\r\n!<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will not be parsed again. Example: Message waiting: !message(,first,rcvd,unread).\r\n\r\n%<field>%\r\nThis will parse the given field. Example: I installed Miranda at: %mirandapath%.\r\n\r\n`<string>`\r\nThis will not parse the given string, any function, field or special character in the string will shown in the result without being translated. Example: Use `%mirandapath%` to show the installation path.\r\n\r\n#<comment>\r\nThis will add a comment in the formatting string. Everything from the # character to the end of the line will be removed. Example: %dbprofile% #this is a useless comment.\r\n\r\n\r\n--- Contacts ---\r\n\r\nWhenever a functions requires a contact as an argument, you can specify it in two ways:\r\n\r\n(1) Using a unique ID (UIN for ICQ, email for MSN) or, a protocol ID followed by a unique ID in the form <PROTOID:UNIQUEID>, for example <MSN:miranda@hotmail.com> or <ICQ:123456789>.\r\n\r\n(2) Using the contact function:\r\n?contact(x,y)\r\nA contact will be searched which will have value x for its property y, y can be one of the following:\r\nfirst, last, nick, email, ID or display\r\n\r\nFor example: ?contact(miranda@hotmail.com,email) or ?contact(Miranda,nick). The contact function will return either a unique contact according to the arguments or nothing if none or multiple contacts exists with the given property.]

 [Tokens]

 [Input]

 [Cancel]

@@ -199,4 +198,4 @@
 [only stores y as variables x]

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

 ;file \plugins\Variables\src\variables.h

-[--- Special characters ---\r\n\r\nThe following characters have a special meaning in a formatting string:\r\n\r\n?<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will be parsed again. Example: Today is ?cdate(yyyy/MM/dd).\r\n\r\n!<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will not be parsed again. Example: Message waiting: !message(,first,rcvd,unread).\r\n\r\n%<field>%\r\nThis will parse the given field. Example: I installed Miranda at: %mirandapath%.\r\n\r\n`<string>`\r\nThis will not parse the given string, any function, field or special character in the string will shown in the result without being translated. Example: Use `%mirandapath%` to show the installation path.\r\n\r\n#<comment>\r\nThis will add a comment in the formatting string. Everything from the # character to the end of the line will be removed. Example: %dbprofile% #this is a useless comment.\r\n\r\n\r\n--- Contacts ---\r\n\r\nWhenever a functions requires a contact as an argument, you can specify it in two ways:\r\n\r\n(1) Using a unique id (UIN for ICQ, email for MSN) or, a protocol id followed by a unique id in the form <PROTOID:UNIQUEID>, for example <MSN:miranda@hotmail.com> or <ICQ:123456789>.\r\n\r\n(2) Using the contact function:\r\n?contact(x,y)\r\nA contact will be searched which will have value x for its property y, y can be one of the following:\r\nfirst, last, nick, email, id or display\r\n\r\nFor example: ?contact(miranda@hotmail.com,email) or ?contact(Miranda,nick). The contact function will return either a unique contact according to the arguments or nothing if none or multiple contacts exists with the given property.]

+[--- Special characters ---\r\n\r\nThe following characters have a special meaning in a formatting string:\r\n\r\n?<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will be parsed again. Example: Today is ?cdate(yyyy/MM/dd).\r\n\r\n!<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will not be parsed again. Example: Message waiting: !message(,first,rcvd,unread).\r\n\r\n%<field>%\r\nThis will parse the given field. Example: I installed Miranda at: %mirandapath%.\r\n\r\n`<string>`\r\nThis will not parse the given string, any function, field or special character in the string will shown in the result without being translated. Example: Use `%mirandapath%` to show the installation path.\r\n\r\n#<comment>\r\nThis will add a comment in the formatting string. Everything from the # character to the end of the line will be removed. Example: %dbprofile% #this is a useless comment.\r\n\r\n\r\n--- Contacts ---\r\n\r\nWhenever a functions requires a contact as an argument, you can specify it in two ways:\r\n\r\n(1) Using a unique ID (UIN for ICQ, email for MSN) or, a protocol ID followed by a unique ID in the form <PROTOID:UNIQUEID>, for example <MSN:miranda@hotmail.com> or <ICQ:123456789>.\r\n\r\n(2) Using the contact function:\r\n?contact(x,y)\r\nA contact will be searched which will have value x for its property y, y can be one of the following:\r\nfirst, last, nick, email, ID or display\r\n\r\nFor example: ?contact(miranda@hotmail.com,email) or ?contact(Miranda,nick). The contact function will return either a unique contact according to the arguments or nothing if none or multiple contacts exists with the given property.]