- langpacks/english: update;

- langpacks/russian: update;

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

12 files changed, 17 insertions, 12 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index fe2a9619b8..1668550f25 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1,7 +1,7 @@
 ;============================================================

 ;  File: miranda32/64.exe

 ;  Module: Miranda Core

-;  Version: 0.95.4

+;  Version: 0.95.5

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

 ;file \src\resource.rc

 [Enter account name (for example, My Google)]

diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index 887c2e515a..c83af2f3fe 100644
--- a/langpacks/english/Plugins/SendSS.txt
+++ b/langpacks/english/Plugins/SendSS.txt
@@ -125,6 +125,7 @@
 [Credits]

 ;file \plugins\SendScreenshotPlus\src\UMainForm.cpp

 [Drag&Drop the target on the desired window.]

+[Send screenshot to %s]

 [Window]

 [Desktop]

 [<Entire Desktop>]

diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 3b58229dcc..ae42393a3a 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -9,7 +9,6 @@
 ;file \protocols\SkypeWeb\res\resource.rc

 [Create group chat]

 [Cancel]

-[New chat's title:]

 [Mark users you want to invite to a new chat]

 [Invite user to chat]

 [Choose one of your contacts to be invited:]

diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index 8af5356df7..9343b9a8fa 100644
--- a/langpacks/english/Plugins/SmileyAdd.txt
+++ b/langpacks/english/Plugins/SmileyAdd.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SmileyAdd.dll

 ;  Plugin: SmileyAdd

-;  Version: 0.2.3.17

+;  Version: 0.2.3.18

 ;  Authors: Peacow, nightwish, bid, borkra

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

 [Smiley support for Miranda NG.]

@@ -13,6 +13,7 @@
 [Author:]

 [Version:]

 [Preview]

+[Use per protocol global smiley packs]

 [Display]

 [Replace only smileys surrounded by spaces]

 [Scale smiley to text height]

@@ -55,6 +56,7 @@
 [Smiley pack %s not found.\nSelect correct smiley pack in the Options -> Customize -> Smileys.]

 [There were problems loading smiley pack (it should be corrected).\nSee network log for details.]

 [Smiley #%u in file %s for smiley pack %s not found.]

+[ global smiley pack]

 [Standard]

 [Regular expression "%s" in smiley pack "%s" could produce "empty matches".]

 [Regular expression "%s" in smiley pack "%s" malformed.]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index f8f01049fb..e467888c82 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.53

+;  Version: 0.1.1.0

 ;  Authors: Miranda NG Team

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

 [VKontakte protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index ac426f0179..b12688af87 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -110,7 +110,7 @@
 [Humidity]

 [More...]

 [Weather Protocol INI Setup]

-[Weather Protocol INI Setup\nInstall and load your weather ini file here]

+[Install and load your weather ini file here]

 [Weather Protocol cannot find any weather INI file stored in your computer. To setup weather INI and add weather stations, please follow the steps:]

 [Click here to download a weather ini file from Miranda file listing]

 [Extract the weather ini file from archive to this directory]

diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt
index b912bad919..9ff719e802 100644
--- a/langpacks/russian/=CORE=.txt
+++ b/langpacks/russian/=CORE=.txt
@@ -1,7 +1,7 @@
 ;============================================================

 ;  File: miranda32/64.exe

 ;  Module: Miranda Core

-;  Version: 0.95.4

+;  Version: 0.95.5

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

 [Enter account name (for example, My Google)]

 Введите имя (например, Google)

diff --git a/langpacks/russian/Plugins/SkypeWeb.txt b/langpacks/russian/Plugins/SkypeWeb.txt
index 840640878f..dafbe0449c 100644
--- a/langpacks/russian/Plugins/SkypeWeb.txt
+++ b/langpacks/russian/Plugins/SkypeWeb.txt
@@ -11,8 +11,6 @@
 Создать комнату чата

 [Cancel]

 Отмена

-[New chat's title:]

-Название новой комнаты

 [Mark users you want to invite to a new chat]

 Отметить пользователей для приглашения в комнату чата

 [Invite user to chat]

diff --git a/langpacks/russian/Plugins/SmileyAdd.txt b/langpacks/russian/Plugins/SmileyAdd.txt
index f048120a57..3b969c5d8b 100644
--- a/langpacks/russian/Plugins/SmileyAdd.txt
+++ b/langpacks/russian/Plugins/SmileyAdd.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SmileyAdd.dll

 ;  Plugin: SmileyAdd

-;  Version: 0.2.3.17

+;  Version: 0.2.3.18

 ;  Authors: Peacow, nightwish, bid, borkra

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

 [Smiley support for Miranda NG.]

@@ -19,6 +19,8 @@
 Версия:

 [Preview]

 Тест

+[Use per protocol global smiley packs]

+Глобальный набор смайлов для протоколов

 [Display]

 Показывать

 [Replace only smileys surrounded by spaces]

@@ -91,6 +93,8 @@ HTTP-подключение SmileyAdd
 Проблемы с загрузкой набора смайлов (необходимо исправить).\nДля подробностей смотрите сетевой лог.

 [Smiley #%u in file %s for smiley pack %s not found.]

 Смайл #%u в файле %s для набора смайлов %s не найден.

+[ global smiley pack]

+ глобальный набор смайлов

 [Standard]

 Стандартные

 [Regular expression "%s" in smiley pack "%s" could produce "empty matches".]

diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt
index c989a9c4af..80919a067d 100644
--- a/langpacks/russian/Plugins/VKontakte.txt
+++ b/langpacks/russian/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: VKontakte.dll

 ;  Plugin: VKontakte protocol

-;  Version: 0.1.0.53

+;  Version: 0.1.1.0

 ;  Authors: Miranda NG Team

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

 [VKontakte protocol support for Miranda NG.]

diff --git a/langpacks/russian/Plugins/Weather.txt b/langpacks/russian/Plugins/Weather.txt
index 42ea20c02f..2b0bbd9712 100644
--- a/langpacks/russian/Plugins/Weather.txt
+++ b/langpacks/russian/Plugins/Weather.txt
@@ -211,8 +211,8 @@ URL доп. информации
 Ещё...

 [Weather Protocol INI Setup]

 Настройка INI файла плагина "Погода"

-[Weather Protocol INI Setup\nInstall and load your weather ini file here]

-Установка INI погоды\nУстановка и загрузка вашего INI погоды здесь

+[Install and load your weather ini file here]

+Установка и загрузка вашего INI погоды здесь

 [Weather Protocol cannot find any weather INI file stored in your computer. To setup weather INI and add weather stations, please follow the steps:]

 Протокол погоды не может найти ни одного INI файла погоды на вашем компьютере. Для установки INI погоды и добавления города следуйте этим указаниям:

 [Click here to download a weather ini file from Miranda file listing]

diff --git a/langpacks/russian/Untranslated/SendSS.txt b/langpacks/russian/Untranslated/SendSS.txt
index 3942aa4f80..9da5d6befd 100644
--- a/langpacks/russian/Untranslated/SendSS.txt
+++ b/langpacks/russian/Untranslated/SendSS.txt
@@ -20,6 +20,7 @@
 [BBC]

 [BBC link]

 [Could not register Miranda service.]

+[Send screenshot to %s]

 [Fill description textbox.]

 [for Client area ]

 [of "]