- langpacks/english: update;

- langpacks/russian: update;

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

11 files changed, 42 insertions, 39 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 3ba13f8c28..5f67a5acc4 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1015,6 +1015,7 @@
 [View/change my &details...]

 ;file \src\core\stduseronline\src\useronline.cpp

 [%s is online]

+;file \src\icons\proto_metacontacts\src\resource.h

 ;file \src\modules\addcontact\addcontact.cpp

 [Add contact]

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

diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt
index b97e5ca473..1e1fcd9ba2 100644
--- a/langpacks/english/Plugins/CmdLine.txt
+++ b/langpacks/english/Plugins/CmdLine.txt
@@ -80,7 +80,7 @@
 [Message sent to '%s'.]

 [Message to '%s' was marked as sent but the account seems to be offline]

 [Could not send message to '%s'.]

-[Timed out while waiting for acknowledgement for contact '%s'.]

+[Timed out while waiting for acknowledgment for contact '%s'.]

 [Could not find contact handle for contact '%s'.]

 [byte:%d]

 [word:%d]

diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index 415ddc3212..548cf1deb7 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -31,7 +31,7 @@
 [Keep connection alive]

 [Show connection errors]

 [Automatically reconnect after unintentional disconnection]

-[Send messages slower, but with full acknowledgement]

+[Send messages slower, but with full acknowledgment]

 [Manually specify connection servers' hosts]

 [* new line is separator\n** hostname:port format]

 [Use SSL secure connection]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index ab547acfb2..056fa25d19 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -858,7 +858,7 @@
 [You can change your password only when you are online]

 [You must be online]

 [Messaging]

-[Send messages slower, but with full acknowledgement]

+[Send messages slower, but with full acknowledgment]

 [Enable avatars]

 [Log chat state changes]

 [Log presence subscription state changes]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 8253c4b314..237481ac4d 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Scriver.dll

 ;  Plugin: Scriver

-;  Version: 2.12.1.1

+;  Version: 2.12.1.2

 ;  Authors: Miranda NG Development Team

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

 [Scriver - send and receive instant messages.]

diff --git a/langpacks/english/Plugins/SkypeClassic.txt b/langpacks/english/Plugins/SkypeClassic.txt
index d5e6fe4b0e..f1c0232313 100644
--- a/langpacks/english/Plugins/SkypeClassic.txt
+++ b/langpacks/english/Plugins/SkypeClassic.txt
@@ -60,17 +60,17 @@
 [Disable support for N/A and SkypeMe status (for Skype 4+)]

 [Show full name in contact list instead of nickname]

 [SkypeOut contacts are in status:]

-[Cleanup Nicknames]

-[Do not wait for message SENT acknowledgement (for some buggy Skype versions >6)]

-[Skype Popups]

-[Incoming Calls]

+[Cleanup nicknames]

+[Do not wait for message SENT acknowledgment (for some buggy Skype versions >6)]

+[Skype popups]

+[Incoming calls]

 [Show incoming calls]

 [seconds]

 [Background]

 [Use Windows colors]

 [Text]

 [Preview]

-[Error Messages]

+[Error messages]

 [Display error messages]

 ;file \protocols\SkypeClassic\src\contacts.cpp

 [Call (Skype)]

@@ -90,7 +90,7 @@
 [&Invite user...]

 [Me]

 [&Leave chat session]

-[Set &Topic...]

+[Set &topic...]

 [User &details]

 [User &history]

 [&Kick user]

@@ -98,29 +98,29 @@
 [Username '%s' provided by Skype API doesn't match username '%s' in your settings. Please either remove username setting in your configuration or correct it. Will not connect!]

 [Cannot reach Skype API, plugin disfunct.]

 [Do a SkypeOut-call]

-[Unable to register with Groupchat module!]

+[Unable to register with group chat module!]

 [invited]

 [Phone call]

-[Incoming Skype Call]

+[Incoming Skype call]

 [Incoming call from %s]

 [Connection to Skype lost]

 [Cleanup finished.]

 [Cannot create window.]

 [Memory allocation error on startup.]

 [This seems to be the first time that you're running the Skype protocol plugin. Do you want to enable the protocol for this Miranda profile? If you chose NO, you can always enable it in the plugin options later.]

-[Cannot register Window message.]

-[Unable to create Mutex!]

+[Cannot register window message.]

+[Unable to create mutex!]

 ;file \protocols\SkypeClassic\src\skypeapi.cpp

-[Misc. Error]

+[Misc. error]

 [User does not exist, check username]

-[Trying to send IM to an user, who is not online]

+[Trying to send IM to a user, who is not online]

 [IM blocked by recipient]

 [Type unsupported]

-[Sending IM message to user, who has not added you to friendslist and has chosen 'only people in my friendslist can start IM']

+[Sending IM message to user, who has not added you to friend list and has chosen 'only people in my friend list can start IM']

 [Sending IM message to user, who has not authorized you and has chosen 'only people whom I have authorized can start IM']

 [Unknown error]

 ;file \protocols\SkypeClassic\src\skypeopt.cpp

-[Preview Error Message]

+[Preview error message]

 [Skype default]

 [Skype advanced]

 [Skype proxy]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 073f3ce1e5..547b5a2685 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: TabSRMM.dll

 ;  Plugin: TabSRMM

-;  Version: 3.4.0.7

+;  Version: 3.4.0.8

 ;  Authors: The Miranda developers team and contributors

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

 [IM and group chat module for Miranda NG.]

@@ -137,7 +137,7 @@
 [Ignore sending timeouts]

 [Load only actual history]

 [Always trim message log to]

-[Events]

+[events]

 [Only show tab bar when it's needed]

 [Container stays on top]

 [Vertical maximize]

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

 [Containers]

 [Message log]

-[Typing Notify]

+[Typing notify]

 [Event notifications]

 [Message window]

 [Load and apply]

@@ -794,16 +794,16 @@
 [Advanced with avatars, vertical orientation]

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

 [This version of TabSRMM requires Windows 2000 or later.]

-[TabSRMM Message (%s)]

+[TabSRMM message (%s)]

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

 [Previews not available when using History++ plugin for message log display.]

-[%d Unread]

+[%d unread]

 [Chat room %s]

-[%d User(s)]

+[%d user(s)]

 [Server window]

 [%s on %s%s]

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

-[Template Set Editor]

+[Template set editor]

 [This will reset the template set to the default built-in templates. Are you sure you want to do this?]

 [Template set was successfully reset, please close and reopen all message windows. This template editor window will now close.]

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

@@ -870,8 +870,8 @@
 [Show seconds in timestamps]

 [Use contacts local time (if timezone info available)]

 [Draw grid lines]

-[Use Incoming/Outgoing Icons]

-[Use Message Grouping]

+[Use incoming/outgoing icons]

+[Use message grouping]

 [Simple text formatting (*bold*, etc.)]

 [Support BBCode formatting]

 [Place a separator in the log after a window lost its foreground status]

@@ -1059,7 +1059,7 @@
 [nick of current contact (if defined)]

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

 [user-defined account name of current contact (if defined).]

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

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

 [path to Miranda root folder]

 [path to folder containing Miranda profiles]

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

@@ -1081,8 +1081,8 @@
 [abbreviated weekday name]

 [full weekday name]

 [Variables]

-[All Files]

-[Select Folder]

+[All files]

+[Select folder]

 [No markers]

 [Show as icons]

 [Show as text symbols]

@@ -1091,16 +1091,16 @@
 [Look up '%s':]

 [No word to look up]

 [&Message %s]

-[Highlight User...]

-[Edit Highlight List...]

+[Highlight user...]

+[Edit highlight list...]

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

 [Unique ID]

 [Nick]

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

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

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

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

 [, event filter active]

-[%s: Message Session]

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

+[%s: message session]

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

 [, %d %s, %d %s idle]

 [hours]

 [hour]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 8cf9c07689..b47a3fe431 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: VKontakte.dll

 ;  Plugin: VKontakte protocol

-;  Version: 0.1.0.40

+;  Version: 0.1.0.43

 ;  Authors: Miranda NG Team

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

 [VKontakte protocol support for Miranda NG.]

@@ -51,6 +51,7 @@
 [Hide chats on startup]

 [Always notify as unread for all incoming message]

 [Force online status upon user activity]

+[Use non-standard urlEncode for sent messages (less traffic)]

 [When I ban user...]

 [Report abuse]

 [Clear server history]

diff --git a/langpacks/english/Plugins/WhatsApp.txt b/langpacks/english/Plugins/WhatsApp.txt
index 1e28fe0599..8880abb73f 100644
--- a/langpacks/english/Plugins/WhatsApp.txt
+++ b/langpacks/english/Plugins/WhatsApp.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: WhatsApp.dll

 ;  Plugin: WhatsApp protocol

-;  Version: 0.1.0.5

+;  Version: 0.1.2.2

 ;  Authors: Uli Hecht

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

 [WhatsApp protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/XSoundNotify.txt b/langpacks/english/Plugins/XSoundNotify.txt
index b75270088a..4114823cdf 100644
--- a/langpacks/english/Plugins/XSoundNotify.txt
+++ b/langpacks/english/Plugins/XSoundNotify.txt
@@ -21,6 +21,7 @@
 [Sound files]

 [WAV files]

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

+[(Unknown contact)]

 [Sounds]

 [XSound Notify]

 ;file \plugins\XSoundNotify\src\xsn_main.cpp

diff --git a/langpacks/english/Plugins/Xfire.txt b/langpacks/english/Plugins/Xfire.txt
index fe12861f96..6fef4c55a3 100644
--- a/langpacks/english/Plugins/Xfire.txt
+++ b/langpacks/english/Plugins/Xfire.txt
@@ -128,7 +128,7 @@
 [The protocol version is too old. Cannot detect a new version number.]

 [Someone logged in with your account. Disconnect.]

 [Do you really want to add %s to your friend list?]

-[Add me to your friends list.]

+[Add me to your friend list.]

 [XFire is not connected.]

 [Current Game]

 [My Current Game]