- langpacks/english: update;

- langpacks/russian: update; 



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

8 files changed, 9 insertions, 16 deletions

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 87edd81351..fb2ff74940 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -137,7 +137,7 @@
 [Contact is no longer on server-list.]

 ;file \protocols\FacebookRM\src\proto.cpp

 [%s server connection]

-[Unable to get Netlib connection for Facebook]

+[Unable to initialize Netlib for %s.]

 [Video call]

 [Facebook ID must be numeric value.]

 [Network]

diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index 97d51dd252..62a4ad82bf 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -70,9 +70,9 @@
 [&Op user]

 [&Deop user]

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

+[%I64u bytes]

 [MSN Alert]

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

-[%I64u bytes]

 [Accept NetMeeting request from %s?]

 [MSN Protocol]

 [Chat session established by my request]

diff --git a/langpacks/english/Plugins/MinecraftDynmap.txt b/langpacks/english/Plugins/MinecraftDynmap.txt
index 6c7f81cdcc..749bd8f3ec 100644
--- a/langpacks/english/Plugins/MinecraftDynmap.txt
+++ b/langpacks/english/Plugins/MinecraftDynmap.txt
@@ -19,5 +19,5 @@
 [Protocol icon]

 ;file \protocols\MinecraftDynmap\src\proto.cpp

 [%s server connection]

-[Unable to get Netlib connection for Minecraft Dynmap]

+[Unable to initialize Netlib for %s.]

 [Visible name]

diff --git a/langpacks/english/Plugins/Omegle.txt b/langpacks/english/Plugins/Omegle.txt
index b952a47174..aa15a231f7 100644
--- a/langpacks/english/Plugins/Omegle.txt
+++ b/langpacks/english/Plugins/Omegle.txt
@@ -59,7 +59,7 @@
 [You both speak the same language.]

 ;file \protocols\Omegle\src\proto.cpp

 [%s server connection]

-[Unable to get Netlib connection for Omegle]

+[Unable to initialize Netlib for %s.]

 [Stranger typing]

 [Stranger stopped typing]

 [Changing stranger]

diff --git a/langpacks/english/Plugins/Steam.txt b/langpacks/english/Plugins/Steam.txt
index 065b54d32b..128fcc4eef 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.3

+;  Version: 0.11.4.0

 ;  Authors: unsane, Robert Pösel

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

 [Steam protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index d64e87bfed..eed99e5dcc 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.10

+;  Version: 3.4.0.11

 ;  Authors: The Miranda developers team and contributors

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

 [IM and group chat module for Miranda NG.]

@@ -127,13 +127,10 @@
 [Select how to display the message log. This setting can be ignored when one of the listed plugins is not installed.]

 [Send text formatting method]

 [You can override the global setting for text formatting here. Use "Force off" to never send formatting info for this contact.]

-[ANSI codepage]

-[Codepage for ANSI encoding/decoding when sending or receiving non-Unicode messages.]

 [Info panel mode]

 [Show avatar in message window]

 [Use private splitter position]

 [Contact is a favorite contact]

-[Force ANSI send / receive]

 [Ignore sending timeouts]

 [Load only actual history]

 [Always trim message log to]

@@ -383,7 +380,6 @@
 [Send to &multiple users]

 [Send to &container]

 [Send &later]

-[Force &ANSI]

 [Send unsafe (ignore timeouts)]

 [Send nudge]

 [Splitter position]

@@ -617,7 +613,6 @@
 [Add this contact permanently to your contact list]

 [Do not add this contact permanently]

 [Expand or collapse the side bar]

-[Character encoding]

 [Contact not on list. You may add it...]

 [A message failed to send successfully.]

 [WARNING: The message you are trying to paste exceeds the message size limit for the active protocol. It will be sent in chunks of max %d characters]

@@ -680,7 +675,6 @@
 [December]

 [Today]

 [Yesterday]

-[Use default codepage]

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

 [<no skin>]

 [Do you want to also read message templates from the theme?\nCaution: This will overwrite the stored template set which may affect the look of your message window significantly.\nSelect Cancel to not load anything at all.]

diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt
index 987f5aa869..05981d30d0 100644
--- a/langpacks/english/Plugins/Twitter.txt
+++ b/langpacks/english/Plugins/Twitter.txt
@@ -48,10 +48,9 @@
 [Basic]

 [Popups]

 [%s server connection]

-[Unable to get Netlib connection for Twitter]

-[Twitter]

+[Unable to initialize Netlib for %s.]

 [%s avatar connection]

-[Unable to get avatar Netlib connection for Twitter]

+[Twitter (avatars)]

 [%s Protocol]

 ;file \protocols\Twitter\src\theme.cpp

 [Twitter Icon]

diff --git a/langpacks/english/Plugins/WhatsApp.txt b/langpacks/english/Plugins/WhatsApp.txt
index 656ffb71e4..6c38306346 100644
--- a/langpacks/english/Plugins/WhatsApp.txt
+++ b/langpacks/english/Plugins/WhatsApp.txt
@@ -58,7 +58,7 @@
 [Message received: %s by %s]

 ;file \protocols\WhatsApp\src\proto.cpp

 [%s server connection]

-[Unable to get Netlib connection for WhatsApp]

+[Unable to initialize Netlib for %s.]

 [Network connection error.]

 [Registration failed. Invalid server response.]

 [Registration failed due to stale code. Please request a new code]