- langpacks/english: update;

- langpacks/russian: update;

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

11 files changed, 23 insertions, 21 deletions

diff --git a/langpacks/english/Plugins/AvatarHistory.txt b/langpacks/english/Plugins/AvatarHistory.txt
index 84c2ab8eff..64114d7912 100644
--- a/langpacks/english/Plugins/AvatarHistory.txt
+++ b/langpacks/english/Plugins/AvatarHistory.txt
@@ -72,9 +72,6 @@
 [Avatars]

 [Contact changed avatar]

 [Contact removed avatar]

-;file \plugins\AvatarHistory\src\AvatarHistory.h

-[removed his/her avatar]

-[changed his/her avatar]

 ;file \plugins\AvatarHistory\src\icolib.cpp

 [History]

 [Avatar Overlay]

@@ -88,6 +85,9 @@
 [Avatar]

 [Popups]

 [Avatar Change]

+;file \plugins\AvatarHistory\src\stdafx.h

+[removed his/her avatar]

+[changed his/her avatar]

 ;file \plugins\AvatarHistory\src\utils.cpp

 [Unknown UIN]

 [Unknown Protocol]

diff --git a/langpacks/english/Plugins/BASS_interface.txt b/langpacks/english/Plugins/BASS_interface.txt
index 6bc1f3ecee..61b2a50e07 100644
--- a/langpacks/english/Plugins/BASS_interface.txt
+++ b/langpacks/english/Plugins/BASS_interface.txt
@@ -27,8 +27,6 @@
 [On the phone]

 [Out to lunch]

 [Preview]

-;file \plugins\BASS_interface\src\Bass_interface.h

-[Bass Interface]

 ;file \plugins\BASS_interface\src\Main.cpp

 [un4seen's bass version: %d.%d.%d.%d]

 [--default device--]

@@ -36,6 +34,8 @@
 [Disable sounds]

 [Enable sounds]

 [Frame background]

+[Bass Interface]

 [Bass library]

 [Sounds enabled]

 [Sounds disabled]

+;file \plugins\BASS_interface\src\stdafx.h

diff --git a/langpacks/english/Plugins/ChangeKeyboardLayout.txt b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
index ca6efe36f2..5c7aec4a9f 100644
--- a/langpacks/english/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
@@ -39,8 +39,6 @@
 [Dismiss]

 [On right click]

 [Preview]

-;file \plugins\ChangeKeyboardLayout\src\commonheaders.h

-[ChangeKeyboardLayout]

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

 [Changing Layout]

 [Changing Case]

@@ -48,3 +46,5 @@
 [Popups]

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

 [Popup]

+;file \plugins\ChangeKeyboardLayout\src\stdafx.h

+[ChangeKeyboardLayout]

diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index d97937fcda..2ac2edd6f8 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -30,8 +30,8 @@
 ;file \protocols\SkypeWeb\src\main.cpp

 [Skype Link Protocol]

 ;file \protocols\SkypeWeb\src\skype_chatrooms.cpp

-[User]

 [Admin]

+[User]

 [&Invite user...]

 [&Leave chat session]

 [&Change topic]

@@ -53,6 +53,7 @@
 [Request authorization]

 [Grant authorization]

 [Get server history]

+[Destroy room]

 [Create new chat]

 ;file \protocols\SkypeWeb\src\skype_messages.cpp

 ;file \protocols\SkypeWeb\src\skype_options.cpp

diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index 05dcbc4020..4cb470f0a5 100644
--- a/langpacks/english/Plugins/Tox.txt
+++ b/langpacks/english/Plugins/Tox.txt
@@ -73,7 +73,7 @@
 [Outgoing call to %s]

 [Unable to find input audio device]

 [Video call is unsupported]

-[Call cancelled]

+[Call canceled]

 [Unable to find output audio device]

 [Call started]

 [Call ended]

diff --git a/langpacks/russian/Plugins/AvatarHistory.txt b/langpacks/russian/Plugins/AvatarHistory.txt
index 3188f487a3..52c291e884 100644
--- a/langpacks/russian/Plugins/AvatarHistory.txt
+++ b/langpacks/russian/Plugins/AvatarHistory.txt
@@ -133,10 +133,6 @@
 Контакт сменил аватар

 [Contact removed avatar]

 Контакт удалил аватар

-[removed his/her avatar]

-удалил(а) свой аватар

-[changed his/her avatar]

-сменил(а) свой аватар

 [History]

 История

 [Avatar Overlay]

@@ -159,6 +155,10 @@
 Всплывающие окна

 [Avatar Change]

 Смена аватара

+[removed his/her avatar]

+удалил(а) свой аватар

+[changed his/her avatar]

+сменил(а) свой аватар

 [Unknown UIN]

 Неизвестный номер

 [Unknown Protocol]

diff --git a/langpacks/russian/Plugins/BASS_interface.txt b/langpacks/russian/Plugins/BASS_interface.txt
index b039740356..4eedaae7c1 100644
--- a/langpacks/russian/Plugins/BASS_interface.txt
+++ b/langpacks/russian/Plugins/BASS_interface.txt
@@ -47,8 +47,6 @@
 Обедаю

 [Preview]

 Тест

-[Bass Interface]

-Библиотека BASS

 [un4seen's bass version: %d.%d.%d.%d]

 Версия библиотеки BASS: %d.%d.%d.%d

 [--default device--]

@@ -61,6 +59,8 @@
 Включить звуки

 [Frame background]

 Фон фрейма

+[Bass Interface]

+Библиотека BASS

 [Bass library]

 Библиотека Bass

 [Sounds enabled]

diff --git a/langpacks/russian/Plugins/ChangeKeyboardLayout.txt b/langpacks/russian/Plugins/ChangeKeyboardLayout.txt
index 87f52c5b9c..1cda09790e 100644
--- a/langpacks/russian/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/russian/Plugins/ChangeKeyboardLayout.txt
@@ -71,8 +71,6 @@
 Правый щелчок

 [Preview]

 Тест

-[ChangeKeyboardLayout]

-Смена раскладки

 [Changing Layout]

 Смена раскладки

 [Changing Case]

@@ -83,3 +81,5 @@
 Всплывающие окна

 [Popup]

 Всплывающее окно

+[ChangeKeyboardLayout]

+Смена раскладки

diff --git a/langpacks/russian/Plugins/SkypeWeb.txt b/langpacks/russian/Plugins/SkypeWeb.txt
index f9ced15dfb..353eb91fdb 100644
--- a/langpacks/russian/Plugins/SkypeWeb.txt
+++ b/langpacks/russian/Plugins/SkypeWeb.txt
@@ -49,10 +49,10 @@
 Введите пароль, чтобы продолжить.

 [Skype Link Protocol]

 Протокол Skype

-[User]

-Пользователь

 [Admin]

 Админ

+[User]

+Пользователь

 [&Invite user...]

 &Пригласить пользователя...

 [&Leave chat session]

@@ -89,6 +89,8 @@
 Авторизовать

 [Get server history]

 Синхронизировать историю

+[Destroy room]

+Удалить комнату чата

 [Create new chat]

 Создать новый чат

 [Network]

diff --git a/langpacks/russian/Plugins/Tox.txt b/langpacks/russian/Plugins/Tox.txt
index adf3d53565..4e89993051 100644
--- a/langpacks/russian/Plugins/Tox.txt
+++ b/langpacks/russian/Plugins/Tox.txt
@@ -125,8 +125,6 @@ IPv6 адрес (необязательно)
 Устройство аудиовхода не найдено

 [Video call is unsupported]

 Видеовызовы не поддерживаются

-[Call cancelled]

-Звонок отменён

 [Unable to find output audio device]

 Выходное аудиоустройство не найдено

 [Call started]

diff --git a/langpacks/russian/Untranslated/Tox.txt b/langpacks/russian/Untranslated/Tox.txt
index 3872aaf45e..92d4286e0d 100644
--- a/langpacks/russian/Untranslated/Tox.txt
+++ b/langpacks/russian/Untranslated/Tox.txt
@@ -1,2 +1,3 @@
 [Tox ID:]

 [Tox]

+[Call canceled]