- langpacks/english: update;

- langpacks/russian: update;

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

20 files changed, 62 insertions, 64 deletions

diff --git a/langpacks/english/Plugins/BuddyPounce.txt b/langpacks/english/Plugins/BuddyPounce.txt
index 3ffe5164f4..e5831bbdeb 100644
--- a/langpacks/english/Plugins/BuddyPounce.txt
+++ b/langpacks/english/Plugins/BuddyPounce.txt
@@ -73,4 +73,4 @@
 [Message failed to send to %s]

 ;file \plugins\BuddyPounce\src\main.cpp

 [&Buddy Pounce]

-[Message Sessions]

+[Message sessions]

diff --git a/langpacks/english/Plugins/ChangeKeyboardLayout.txt b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
index b41d5215d6..ca6efe36f2 100644
--- a/langpacks/english/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
@@ -44,7 +44,7 @@
 ;file \plugins\ChangeKeyboardLayout\src\hook_events.cpp

 [Changing Layout]

 [Changing Case]

-[Message Sessions]

+[Message sessions]

 [Popups]

 ;file \plugins\ChangeKeyboardLayout\src\main.cpp

 [Popup]

diff --git a/langpacks/english/Plugins/Fingerprint.txt b/langpacks/english/Plugins/Fingerprint.txt
index 296a7bc3db..70fed7dfaa 100644
--- a/langpacks/english/Plugins/Fingerprint.txt
+++ b/langpacks/english/Plugins/Fingerprint.txt
@@ -78,6 +78,7 @@
 [Yahoo overlay]

 [Mail.Ru Agent overlay]

 [VK overlay]

+[Skype overlay]

 [ICQ 2003 overlay]

 [ICQ Lite 4 overlay]

 [ICQ v5.x overlay]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 7f6d9daff6..1f66ef9c90 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: ICQ.dll

 ;  Plugin: IcqOscarJ protocol

-;  Version: 0.11.3.1

+;  Version: 0.11.3.2

 ;  Authors: Joe Kucera, Bio, Martin Öberg, Richard Hughes, Jon Keating, etc.

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

 [ICQ protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/IEView.txt b/langpacks/english/Plugins/IEView.txt
index 782a250415..9dd2646a2e 100644
--- a/langpacks/english/Plugins/IEView.txt
+++ b/langpacks/english/Plugins/IEView.txt
@@ -62,7 +62,7 @@
 [Group chats]

 [History]

 [Default]

-[Message Sessions]

+[Message sessions]

 [IEView]

 [Skins]

 [Template]

diff --git a/langpacks/english/Plugins/KeyboardNotify.txt b/langpacks/english/Plugins/KeyboardNotify.txt
index 31d9bd9c80..9ea3afe811 100644
--- a/langpacks/english/Plugins/KeyboardNotify.txt
+++ b/langpacks/english/Plugins/KeyboardNotify.txt
@@ -16,7 +16,7 @@
 [Message-Event only]

 [Blink if message window is open]

 [and not in foreground]

-[Only if last is]

+[only if last is]

 [sec. old]

 [Flash until]

 [seconds]

diff --git a/langpacks/english/Plugins/NimContact.txt b/langpacks/english/Plugins/NimContact.txt
index 685c2a0de1..90aaecbf8a 100644
--- a/langpacks/english/Plugins/NimContact.txt
+++ b/langpacks/english/Plugins/NimContact.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: NimContact.dll

 ;  Plugin: Non-IM Contact

-;  Version: 0.6.0.1

+;  Version: 0.6.0.2

 ;  Authors: Jonathan Gordon

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

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

diff --git a/langpacks/english/Plugins/QuickMessages.txt b/langpacks/english/Plugins/QuickMessages.txt
index dab638aeea..12bb50b967 100644
--- a/langpacks/english/Plugins/QuickMessages.txt
+++ b/langpacks/english/Plugins/QuickMessages.txt
@@ -37,6 +37,6 @@
 [You win!]

 [New Button]

 [New Menu Entry]

-[Message Sessions]

+[Message sessions]

 ;file \plugins\QuickMessages\src\Utils.cpp

 [Quick Messages Button %u]

diff --git a/langpacks/english/Plugins/QuickReplies.txt b/langpacks/english/Plugins/QuickReplies.txt
index 3da0614156..b5ac644e78 100644
--- a/langpacks/english/Plugins/QuickReplies.txt
+++ b/langpacks/english/Plugins/QuickReplies.txt
@@ -18,4 +18,4 @@
 [Button]

 [Quick Replies\r\nLeft button - open menu\r\nRight button - options page]

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

-[Message Sessions]

+[Message sessions]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index b50279ee71..341f715db7 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -44,7 +44,7 @@
 [inactive]

 [Min input area size]

 [lines]

-[Message Window Event Log]

+[Message window event log]

 [Enable IEView]

 [Show icons]

 [Show time]

@@ -65,7 +65,7 @@
 [Events in the last]

 [events]

 [minutes]

-[Typing Notification Options]

+[Typing notification options]

 [Send typing notifications to the following users when you are typing a message to them:]

 [Show typing notification switch in the status bar]

 [Show typing notifications when a user is typing a message]

@@ -73,19 +73,19 @@
 [Show typing notification when no message dialog is open]

 [Flash in the system tray and in the contact list]

 [Show balloon popup]

-[Send Error]

+[Send error]

 [An error has occurred. The protocol reported the following error:]

 [while sending the following message:]

 [Try again]

 [Cancel]

-[Message Session]

+[Message session]

 [&User menu]

 [User &details]

 [&Emoticons]

 [&Add]

 [&History]

 [&Quote]

-[Send To All Tabs]

+[Send to all tabs]

 [You are about to send a message to all open tabs.\nAre you sure?]

 [Remember my choice for this container]

 [Yes]

@@ -96,7 +96,7 @@
 [&Color]

 [&Background color]

 [&Filter]

-[&Room Settings]

+[&Room settings]

 [&Show/hide nick list]

 [Show these events only:]

 [Actions]

@@ -115,7 +115,7 @@
 [Add new rooms to group:]

 [Nick list row height]

 [pixels]

-[Log Options]

+[Log options]

 [Your name]

 [Other name]

 [Timestamp]

@@ -127,7 +127,7 @@
 [Location]

 [Trim to]

 [KB]

-[Group Chat]

+[Group chat]

 [Use same style as in the message log]

 [Use default colors]

 [Use custom colors]

@@ -137,8 +137,8 @@
 [(0 means default setting, -1 means indefinite time)]

 [Log]

 [&Copy]

-[Co&py All]

-[Select &All]

+[Co&py all]

+[Select &all]

 [Word lookup]

 [Bing]

 [Yandex]

@@ -147,7 +147,7 @@
 [Google Translate]

 [Yahoo]

 [Foodnetwork]

-[C&lear Log]

+[C&lear log]

 [&Open link]

 [&Copy link]

 [Message]

@@ -156,15 +156,14 @@
 [Cut]

 [Copy]

 [Paste]

-[Paste && Send]

+[Paste && send]

 [Delete]

 [Clear]

-[Close Other Tabs]

-[Close Tab]

+[Close other tabs]

+[Close tab]

 [List]

 [&Message]

 [Clear lo&g]

-[Co&py all]

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

 [Add contact]

 [User's details]

@@ -232,9 +231,9 @@
 [Korean (Johab)]

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

 [Messaging]

-[Navigate: Previous Tab]

-[Navigate: Next Tab]

-[Navigate: Tab %d]

+[Navigate: previous tab]

+[Navigate: next tab]

+[Navigate: tab %d]

 [Window: Toggle status bar]

 [Window: Toggle title bar]

 [Window: Toggle toolbar]

@@ -248,29 +247,27 @@
 ;file \plugins\Scriver\src\msgdialog.cpp

 [Quote]

 [Smiley]

-[Add Contact]

-[User Menu]

+[User menu]

 [User details]

 [History]

 [Send]

 [Look up '%s':]

 [No word to look up]

-[Add Contact Permanently to List]

-[View User's Details]

-[View User's History]

-[Quote Text]

-[Insert Emoticon]

-[Send Message]

-[User Menu - %s]

+[Add contact permanently to list]

+[View user's details]

+[View user's history]

+[Quote text]

+[Insert emoticon]

+[User menu - %s]

 [Sending in progress: %d message(s) left...]

 [%s is typing a message...]

 [Last message received on %s at %s.]

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

-[Unknown Contact]

+[Unknown contact]

 [Me]

 [O Lord, bless this Thy hand grenade that with it Thou mayest blow Thine enemies]

 [to tiny bits, in Thy mercy]

-[My Contact]

+[My contact]

 [Lorem ipsum dolor sit amet,]

 [consectetur adipisicing elit]

 [Today]

@@ -281,8 +278,8 @@
 [URL received]

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

 [General]

-[Event Log]

-[Group Chat Log]

+[Event log]

+[Group chat log]

 [Outgoing messages]

 [Outgoing background]

 [Incoming messages]

@@ -314,24 +311,24 @@
 [** New contacts **]

 [** Unknown contacts **]

 [Show balloon popup (unsupported system)]

-[Message Sessions]

-[Typing Notify]

+[Message sessions]

+[Typing notify]

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

 [Message from %s]

 [%s is typing a message]

-[Typing Notification]

+[Typing notification]

 [Miranda could not load the built-in message module, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda.]

 [Instant messages]

-[Incoming (Focused Window)]

-[Incoming (Unfocused Window)]

-[Incoming (New Session)]

+[Incoming (focused window)]

+[Incoming (unfocused window)]

+[Incoming (new session)]

 [Outgoing]

 [Contact started typing]

 [Contact stopped typing]

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

 [An unknown error has occurred.]

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

-[Always On Top]

+[Always on top]

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

 [The message send timed out.]

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

@@ -420,7 +417,7 @@
 [Variables]

 [Appearance]

 [Default events to show in new chat rooms if the 'event filter' is enabled]

-[Select Folder]

+[Select folder]

 [Popups]

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

 [&Message %s]

@@ -443,7 +440,7 @@
 [Nickname]

 [Unique ID]

 [Status]

-[%s: Chat Room (%u user)]

-[%s: Chat Room (%u users)]

-[%s: Message Session]

-[%s: Message Session (%u users)]

+[%s: chat room (%u user)]

+[%s: chat room (%u users)]

+[%s: message session]

+[%s: message session (%u users)]

diff --git a/langpacks/english/Plugins/Sessions.txt b/langpacks/english/Plugins/Sessions.txt
index 8fcf76fd9e..fa609700a2 100644
--- a/langpacks/english/Plugins/Sessions.txt
+++ b/langpacks/english/Plugins/Sessions.txt
@@ -63,6 +63,6 @@
 [Load last session]

 ;file \plugins\Sessions\Src\Options.cpp

 [View]

-[Message Sessions]

+[Message sessions]

 ;file \plugins\Sessions\Src\Utils.cpp

 [Session Before Last Crash]

diff --git a/langpacks/english/Plugins/SimpleAR.txt b/langpacks/english/Plugins/SimpleAR.txt
index d6a3e69de9..098b334531 100644
--- a/langpacks/english/Plugins/SimpleAR.txt
+++ b/langpacks/english/Plugins/SimpleAR.txt
@@ -27,4 +27,4 @@
 [Dear %user%, the owner left the following message:]

 ;file \plugins\SimpleAR\src\Options.cpp

 [Simple Auto Replier]

-[Message Sessions]

+[Message sessions]

diff --git a/langpacks/english/Plugins/SpellChecker.txt b/langpacks/english/Plugins/SpellChecker.txt
index cd5fcca5d5..279d6fece2 100644
--- a/langpacks/english/Plugins/SpellChecker.txt
+++ b/langpacks/english/Plugins/SpellChecker.txt
@@ -44,7 +44,7 @@
 [Tagalog (Philippines)]

 [German (Germany)]

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

-[Message Sessions]

+[Message sessions]

 [Auto-replacements]

 [Line]

 [Dotted]

diff --git a/langpacks/english/Plugins/Steam.txt b/langpacks/english/Plugins/Steam.txt
index beb63d2717..5f766ba4bd 100644
--- a/langpacks/english/Plugins/Steam.txt
+++ b/langpacks/english/Plugins/Steam.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Steam.dll

 ;  Plugin: Steam protocol

-;  Version: 0.11.3.1

+;  Version: 0.11.3.2

 ;  Authors: unsane, Robert Pösel

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

 [Steam protocol support for Miranda NG.]

@@ -19,6 +19,9 @@
 [As an added account security measure, you'll need to grant access by entering the special code we've just sent to your email address.]

 [Go to email domain]

 [Block]

+[Enter password]

+[Save password]

+[Enter the password to continue.]

 ;file \protocols\Steam\src\stdafx.cpp

 [Steam game]

 ;file \protocols\Steam\src\steam_contacts.cpp

diff --git a/langpacks/english/Plugins/StopSpam.txt b/langpacks/english/Plugins/StopSpam.txt
index d15f78de16..7c712796ab 100644
--- a/langpacks/english/Plugins/StopSpam.txt
+++ b/langpacks/english/Plugins/StopSpam.txt
@@ -24,7 +24,7 @@
 [Remove all temporary contacts after restart]

 [Log Spammers to system history]

 ;file \plugins\StopSpamPlus\src\events.cpp

-[Message Sessions]

+[Message sessions]

 [General]

 [Messages]

 [Accounts]

diff --git a/langpacks/english/Plugins/StopSpamMod.txt b/langpacks/english/Plugins/StopSpamMod.txt
index 3e11713322..67b43392c7 100644
--- a/langpacks/english/Plugins/StopSpamMod.txt
+++ b/langpacks/english/Plugins/StopSpamMod.txt
@@ -50,7 +50,7 @@
 [Congratulations! You just passed human/robot test. Now you can write me a message.]

 [If math expression is turned on, you can use following expression in message text:\nXX+XX-X/X*X\neach X will be replaced by one random number and answer will be expression result.\nMessage must contain only one expression without spaces.]

 [Info]

-[Message Sessions]

+[Message sessions]

 [General]

 [Messages]

 [Accounts]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index c721114562..c29dcdc9f9 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -205,7 +205,7 @@
 [Load previous events less than]

 [minutes old]

 [Global message log display]

-[Typing notification]

+[Typing notify]

 [Send typing notifications to the following users when you are typing a message to them:]

 [        Show typing notifications in the message window]

 [Flash window once on typing events (only if flashing enabled)]

@@ -611,6 +611,7 @@
 [Avatars]

 [Saved TabSRMM avatars]

 [Group chat logs root]

+[Typing notification]

 ;file \plugins\TabSRMM\src\modplus.cpp

 [Insert [img] tag / surround selected text with [img][/img]]

 ;file \plugins\TabSRMM\src\msgdialog.cpp

@@ -703,7 +704,6 @@
 [Tabs and layout]

 [Containers]

 [Message log]

-[Typing notify]

 [Event notifications]

 [Message window]

 [Load and apply]

diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt
index 9f3ebedc2a..cf8c44c750 100644
--- a/langpacks/english/Plugins/Twitter.txt
+++ b/langpacks/english/Plugins/Twitter.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Twitter.dll

 ;  Plugin: Twitter protocol

-;  Version: 1.1.0.3

+;  Version: 1.2.0.1

 ;  Authors: dentist, omniwolf, Thief

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

 [Twitter protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/WinterSpeak.txt b/langpacks/english/Plugins/WinterSpeak.txt
index ad8b4457f3..f4333fc9eb 100644
--- a/langpacks/english/Plugins/WinterSpeak.txt
+++ b/langpacks/english/Plugins/WinterSpeak.txt
@@ -62,9 +62,6 @@
 [Speak]

 [Engine/Voice]

 [Announce]

-;file \plugins\WinterSpeak\src\SpeakAnnounce.cpp

-[Message Session]

-[Message Received]

 ;file \plugins\WinterSpeak\src\UserInformation.cpp

 [%u is now offline]

 [%u is now online]

diff --git a/langpacks/english/Plugins/YARelay.txt b/langpacks/english/Plugins/YARelay.txt
index ebefe7aab2..46e9b1dc0a 100644
--- a/langpacks/english/Plugins/YARelay.txt
+++ b/langpacks/english/Plugins/YARelay.txt
@@ -34,5 +34,5 @@
 ;file \plugins\YARelay\src\options.cpp

 [!EVERYONE!]

 [!DON'T FORWARD!]

-[Message Sessions]

+[Message sessions]

 [Messages forwarding]