- langpacks/english: update;

- langpacks/russian: update; 



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

21 files changed, 19 insertions, 44 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]

diff --git a/langpacks/russian/Plugins/Facebook.txt b/langpacks/russian/Plugins/Facebook.txt
index 6d75ea69c8..a0f210a8d6 100644
--- a/langpacks/russian/Plugins/Facebook.txt
+++ b/langpacks/russian/Plugins/Facebook.txt
@@ -239,8 +239,6 @@ Facebook потребовал чистки компьютера и плагин
 Контакта больше нет в списке на сервере.

 [%s server connection]

 %s подключение к серверу

-[Unable to get Netlib connection for Facebook]

-Невозможно создать подключение Netlib для Facebook

 [Video call]

 Видеовызов

 [Facebook ID must be numeric value.]

diff --git a/langpacks/russian/Plugins/MSN.txt b/langpacks/russian/Plugins/MSN.txt
index 1adc49f693..a550649298 100644
--- a/langpacks/russian/Plugins/MSN.txt
+++ b/langpacks/russian/Plugins/MSN.txt
@@ -121,12 +121,12 @@
 &Сделать пользователя админом

 [&Deop user]

 &Снять с пользователя админ права

+[%I64u bytes]

+%I64u байт

 [MSN Alert]

 MSN уведомление

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

 Контакт пытался открыть аудиоконференцию (не поддерживается)

-[%I64u bytes]

-%I64u байт

 [Accept NetMeeting request from %s?]

 Принять запрос NetMeeting от %s?

 [MSN Protocol]

diff --git a/langpacks/russian/Plugins/MinecraftDynmap.txt b/langpacks/russian/Plugins/MinecraftDynmap.txt
index 3a5802b46e..fb3ceaffaa 100644
--- a/langpacks/russian/Plugins/MinecraftDynmap.txt
+++ b/langpacks/russian/Plugins/MinecraftDynmap.txt
@@ -23,7 +23,5 @@
 Значок протокола

 [%s server connection]

 %s подключение к серверу

-[Unable to get Netlib connection for Minecraft Dynmap]

-Невозможно создать подключение Netlib для Minecraft Dynmap

 [Visible name]

 Видимое имя

diff --git a/langpacks/russian/Plugins/Omegle.txt b/langpacks/russian/Plugins/Omegle.txt
index 702201825d..9160741afa 100644
--- a/langpacks/russian/Plugins/Omegle.txt
+++ b/langpacks/russian/Plugins/Omegle.txt
@@ -101,8 +101,6 @@ Omegle - отличный способ найти новых друзей!
 Вы говорите на одном языке.

 [%s server connection]

 Подключение к серверу %s

-[Unable to get Netlib connection for Omegle]

-Невозможно создать подключение Netlib для Omegle

 [Stranger typing]

 Незнакомец набирает текст

 [Stranger stopped typing]

diff --git a/langpacks/russian/Plugins/Steam.txt b/langpacks/russian/Plugins/Steam.txt
index b5ec936e63..97a969c235 100644
--- a/langpacks/russian/Plugins/Steam.txt
+++ b/langpacks/russian/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/russian/Plugins/TabSRMM.txt b/langpacks/russian/Plugins/TabSRMM.txt
index 858bf1b5d7..b58f67b663 100644
--- a/langpacks/russian/Plugins/TabSRMM.txt
+++ b/langpacks/russian/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.]

@@ -243,10 +243,6 @@
 Метод отправки форматирования

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

 Смена отправки информации о формате текста. "Выключить" - отключает форматирование для этого контакта.

-[ANSI codepage]

-Кодовая страница ANSI

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

-Кодовая страница ANSI для перекодирования не-Юникод сообщений.

 [Info panel mode]

 Режим инфо панели

 [Show avatar in message window]

@@ -255,8 +251,6 @@
 Собственный разделитель

 [Contact is a favorite contact]

 Контакт находится в избранном

-[Force ANSI send / receive]

-Приём/отправка всегда в ANSI

 [Ignore sending timeouts]

 Игнорировать таймаут отправки

 [Load only actual history]

@@ -755,8 +749,6 @@ Esc закрывает сессию (иначе - сворачивает)
 Отправить всему &контейнеру

 [Send &later]

 Отправить &позже

-[Force &ANSI]

-Принудительно &ANSI

 [Send unsafe (ignore timeouts)]

 Отправлять небезопасно (без таймаутов)

 [Send nudge]

@@ -1199,8 +1191,6 @@ TabSRMM: набирает
 Не добавлять этот контакт в список

 [Expand or collapse the side bar]

 Развернуть или свернуть боковую панель

-[Character encoding]

-Кодировка

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

 Контакт не в списке. Вы можете добавить его...

 [A message failed to send successfully.]

@@ -1321,8 +1311,6 @@ TabSRMM: набирает
 Сегодня

 [Yesterday]

 Вчера

-[Use default codepage]

-Кодировка по умолчанию

 [<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/russian/Plugins/Twitter.txt b/langpacks/russian/Plugins/Twitter.txt
index c605e4af57..3a7acb86bd 100644
--- a/langpacks/russian/Plugins/Twitter.txt
+++ b/langpacks/russian/Plugins/Twitter.txt
@@ -81,8 +81,6 @@ URL:
 Всплывающие окна

 [%s server connection]

 %s подключение к серверу

-[Unable to get Netlib connection for Twitter]

-Невозможно создать подключение Netlib для Twitter

 [%s avatar connection]

 %s подключение аватаров

 [%s Protocol]

diff --git a/langpacks/russian/Plugins/WhatsApp.txt b/langpacks/russian/Plugins/WhatsApp.txt
index 923e204c30..52273217ff 100644
--- a/langpacks/russian/Plugins/WhatsApp.txt
+++ b/langpacks/russian/Plugins/WhatsApp.txt
@@ -97,8 +97,6 @@
 Сообщение принято в: %s пользователем %s

 [%s server connection]

 %s подключение к серверу

-[Unable to get Netlib connection for WhatsApp]

-Невозможно создать подключение Netlib для WhatsApp

 [Network connection error.]

 Ошибка соединения.

 [Registration failed. Invalid server response.]

diff --git a/langpacks/russian/Untranslated/Facebook.txt b/langpacks/russian/Untranslated/Facebook.txt
index b01a4c6b20..1521676969 100644
--- a/langpacks/russian/Untranslated/Facebook.txt
+++ b/langpacks/russian/Untranslated/Facebook.txt
@@ -1,3 +1,4 @@
 [URL:]

 [Ticker feeds]

 [Sample ticker]

+[Unable to initialize Netlib for %s.]

diff --git a/langpacks/russian/Untranslated/MinecraftDynmap.txt b/langpacks/russian/Untranslated/MinecraftDynmap.txt
new file mode 100644
index 0000000000..6283855ade
--- /dev/null
+++ b/langpacks/russian/Untranslated/MinecraftDynmap.txt
@@ -0,0 +1 @@
+[Unable to initialize Netlib for %s.]

diff --git a/langpacks/russian/Untranslated/Omegle.txt b/langpacks/russian/Untranslated/Omegle.txt
new file mode 100644
index 0000000000..6283855ade
--- /dev/null
+++ b/langpacks/russian/Untranslated/Omegle.txt
@@ -0,0 +1 @@
+[Unable to initialize Netlib for %s.]

diff --git a/langpacks/russian/Untranslated/Twitter.txt b/langpacks/russian/Untranslated/Twitter.txt
index 2bc3af42fb..3f8c0582e3 100644
--- a/langpacks/russian/Untranslated/Twitter.txt
+++ b/langpacks/russian/Untranslated/Twitter.txt
@@ -1,4 +1,4 @@
 [Failed to get Twitter Access Tokens, please go offline and try again. If this keeps happening, check your internet connection.]

 [You're missing the Nick key in the database. This isn't really a big deal, but you'll notice some minor quirks (self contact in list, no group chat outgoing message highlighting, etc). To fix it either add it manually or reset your Twitter account in the Miranda account options]

-[Twitter]

-[Unable to get avatar Netlib connection for Twitter]

+[Unable to initialize Netlib for %s.]

+[Twitter (avatars)]

diff --git a/langpacks/russian/Untranslated/WhatsApp.txt b/langpacks/russian/Untranslated/WhatsApp.txt
new file mode 100644
index 0000000000..6283855ade
--- /dev/null
+++ b/langpacks/russian/Untranslated/WhatsApp.txt
@@ -0,0 +1 @@
+[Unable to initialize Netlib for %s.]