- langpacks/english: updated

- langpacks/russian^ Skype.txt new lines

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

6 files changed, 108 insertions, 58 deletions

diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index e46b2d0090..739d46c02d 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -1734,7 +1734,7 @@
 ;  File: AddContactPlus.dll

 ;  Plugin: Add contact+

 ;  Version: 0.9.9.1

-;  Authors: Bartosz 'Dezeath' Białek

+;  Authors: Bartosz 'Dezeath' Biaіek

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

 [Provides the ability to quickly add new contacts.]

 ;file \plugins\AddContactPlus\res\resource.rc

@@ -13132,7 +13132,7 @@
 ;============================================================

 ;  File: PluginUpdater.dll

 ;  Plugin: Plugin updater

-;  Version: 0.1.1.2

+;  Version: 0.1.1.3

 ;  Authors: Mataes, George Hazan

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

 [Plugin updater for Miranda NG.]

@@ -15031,7 +15031,7 @@
 ;  File: SimpleStatusMsg.dll

 ;  Plugin: Simple status message

 ;  Version: 1.9.0.4

-;  Authors: Bartosz 'Dezeath' Białek, Harven

+;  Authors: Bartosz 'Dezeath' Biaіek, Harven

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

 [Provides a simple way to set status and away messages.]

 ;file \plugins\SimpleStatusMsg\res\resource.rc

@@ -15197,7 +15197,7 @@
 [Skype name:]

 [&Create]

 [Topic:]

-[Guidline:]

+[Guideline:]

 [Enable joining]

 [Users joining as:]

 [Create with password]

@@ -15210,7 +15210,7 @@
 [Set password]

 [Hint:]

 [Enter password]

-[Enter a password for skype name %d:]

+[Enter a password]

 [Remember this session password]

 [OK]

 [Cancel]

@@ -15245,6 +15245,8 @@
 [for incoming connections]

 [Use ports 80 and 443 as alternative incoming]

 [Default group:]

+[Skype bookmarks]

+[Server side bookmarks\nControl conference bookmarks on server.]

 ;file \protocols\Skype\src\skype.cpp

 [Did not unpack SkypeKit.exe.]

 ;file \protocols\Skype\src\skype_account.cpp

@@ -15282,6 +15284,9 @@
 [The new password was unacceptable]

 [Account was currently not logged in]

 [You have not entered a Skype name.\nConfigure this in Options->Network->Skype and try again.]

+;file \protocols\Skype\src\skype_bookmarks.cpp

+[Name]

+[Conferences]

 ;file \protocols\Skype\src\skype_chat.cpp

 [&User details]

 [&Request auth]

@@ -15297,15 +15302,18 @@
 [Copy &skypename]

 [Copy room &uri]

 [me]

-[Incoming group call received]

+[waits to join]

 [Incoming group call finished]

+[The password is incorrect]

+[Your application to join the conference was denied]

+[Incoming group call received]

 [You did not select any contact]

 [Hi! I'd like to add you to my contact list]

 ;file \protocols\Skype\src\skype_contacts.cpp

 [Contact already in your contact list]

 [Contacts received]

 ;file \protocols\Skype\src\skype_dialogs.cpp

-[Enter a password for Skype Name %s:]

+[Enter a password for %s:]

 [Password can't be empty.]

 [Old password is not correct.]

 [New password is same as old password.]

@@ -15316,16 +15324,18 @@
 [You are not currently connected to the Skype network. You must be online in order to update your information on the server.]

 ;file \protocols\Skype\src\skype_events.cpp

 [Spawn conference]

+[Bookmark]

 [Network]

 [Contacts]

 [Home]

 [General]

-[Incoming call received]

-[Incoming call from %s. Use offical skype for calling.]

 ;file \protocols\Skype\src\skype_icons.cpp

 [Protocol icon]

 [Call]

 [Send contact]

+[Delete]

+[Ignore]

+[Block]

 [Protocols]

 ;file \protocols\Skype\src\skype_instances.cpp

 [SkypeKit will only permit you to login to one account at a time.\nAdding multiple instances of SkypeKit is prohibited in the licence agreement and standard distribution terms.]

@@ -15333,10 +15343,14 @@
 [SkypeKit did not initialize (%d).]

 [SkypeKit did not start.]

 ;file \protocols\Skype\src\skype_menus.cpp

-[Revoke authorization]

 [Request authorization]

 [Grant authorization]

+[Revoke authorization]

+[Set bookmark]

+[Bookmarks]

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

+[Incoming call received]

+[Incoming call from %s. Use offical skype for calling.]

 [Incoming call finished]

 ;file \protocols\Skype\src\skype_netlib.cpp

 [%s connection]

diff --git a/langpacks/english/Plugins/AddContactPlus.txt b/langpacks/english/Plugins/AddContactPlus.txt
index 04031fbee8..783a7126c9 100644
--- a/langpacks/english/Plugins/AddContactPlus.txt
+++ b/langpacks/english/Plugins/AddContactPlus.txt
@@ -3,7 +3,7 @@
 ;  File: AddContactPlus.dll

 ;  Plugin: Add contact+

 ;  Version: 0.9.9.1

-;  Authors: Bartosz 'Dezeath' Białek

+;  Authors: Bartosz 'Dezeath' Biaіek

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

 [Provides the ability to quickly add new contacts.]

 ;file \plugins\AddContactPlus\res\resource.rc

diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index 7434de1c5d..cfb87c8e6d 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: PluginUpdater.dll

 ;  Plugin: Plugin updater

-;  Version: 0.1.1.2

+;  Version: 0.1.1.3

 ;  Authors: Mataes, George Hazan

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

 [Plugin updater for Miranda NG.]

diff --git a/langpacks/english/Plugins/SimpleStatusMsg.txt b/langpacks/english/Plugins/SimpleStatusMsg.txt
index bb4049d054..76ee7cbb67 100644
--- a/langpacks/english/Plugins/SimpleStatusMsg.txt
+++ b/langpacks/english/Plugins/SimpleStatusMsg.txt
@@ -3,7 +3,7 @@
 ;  File: SimpleStatusMsg.dll

 ;  Plugin: Simple status message

 ;  Version: 1.9.0.4

-;  Authors: Bartosz 'Dezeath' Białek, Harven

+;  Authors: Bartosz 'Dezeath' Biaіek, Harven

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

 [Provides a simple way to set status and away messages.]

 ;file \plugins\SimpleStatusMsg\res\resource.rc

diff --git a/langpacks/english/Plugins/Skype.txt b/langpacks/english/Plugins/Skype.txt
index 18869c4529..d73c0e197e 100644
--- a/langpacks/english/Plugins/Skype.txt
+++ b/langpacks/english/Plugins/Skype.txt
@@ -16,7 +16,7 @@
 [Skype name:]

 [&Create]

 [Topic:]

-[Guidline:]

+[Guideline:]

 [Enable joining]

 [Users joining as:]

 [Create with password]

@@ -29,7 +29,7 @@
 [Set password]

 [Hint:]

 [Enter password]

-[Enter a password for skype name %d:]

+[Enter a password]

 [Remember this session password]

 [OK]

 [Cancel]

@@ -64,6 +64,8 @@
 [for incoming connections]

 [Use ports 80 and 443 as alternative incoming]

 [Default group:]

+[Skype bookmarks]

+[Server side bookmarks\nControl conference bookmarks on server.]

 ;file \protocols\Skype\src\skype.cpp

 [Did not unpack SkypeKit.exe.]

 ;file \protocols\Skype\src\skype_account.cpp

@@ -101,6 +103,9 @@
 [The new password was unacceptable]

 [Account was currently not logged in]

 [You have not entered a Skype name.\nConfigure this in Options->Network->Skype and try again.]

+;file \protocols\Skype\src\skype_bookmarks.cpp

+[Name]

+[Conferences]

 ;file \protocols\Skype\src\skype_chat.cpp

 [&User details]

 [&Request auth]

@@ -116,15 +121,18 @@
 [Copy &skypename]

 [Copy room &uri]

 [me]

-[Incoming group call received]

+[waits to join]

 [Incoming group call finished]

+[The password is incorrect]

+[Your application to join the conference was denied]

+[Incoming group call received]

 [You did not select any contact]

 [Hi! I'd like to add you to my contact list]

 ;file \protocols\Skype\src\skype_contacts.cpp

 [Contact already in your contact list]

 [Contacts received]

 ;file \protocols\Skype\src\skype_dialogs.cpp

-[Enter a password for Skype Name %s:]

+[Enter a password for %s:]

 [Password can't be empty.]

 [Old password is not correct.]

 [New password is same as old password.]

@@ -135,16 +143,18 @@
 [You are not currently connected to the Skype network. You must be online in order to update your information on the server.]

 ;file \protocols\Skype\src\skype_events.cpp

 [Spawn conference]

+[Bookmark]

 [Network]

 [Contacts]

 [Home]

 [General]

-[Incoming call received]

-[Incoming call from %s. Use offical skype for calling.]

 ;file \protocols\Skype\src\skype_icons.cpp

 [Protocol icon]

 [Call]

 [Send contact]

+[Delete]

+[Ignore]

+[Block]

 [Protocols]

 ;file \protocols\Skype\src\skype_instances.cpp

 [SkypeKit will only permit you to login to one account at a time.\nAdding multiple instances of SkypeKit is prohibited in the licence agreement and standard distribution terms.]

@@ -152,10 +162,14 @@
 [SkypeKit did not initialize (%d).]

 [SkypeKit did not start.]

 ;file \protocols\Skype\src\skype_menus.cpp

-[Revoke authorization]

 [Request authorization]

 [Grant authorization]

+[Revoke authorization]

+[Set bookmark]

+[Bookmarks]

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

+[Incoming call received]

+[Incoming call from %s. Use offical skype for calling.]

 [Incoming call finished]

 ;file \protocols\Skype\src\skype_netlib.cpp

 [%s connection]

diff --git a/langpacks/russian/Plugins/Skype.txt b/langpacks/russian/Plugins/Skype.txt
index fd589691db..2c4f19aa07 100644
--- a/langpacks/russian/Plugins/Skype.txt
+++ b/langpacks/russian/Plugins/Skype.txt
@@ -17,8 +17,8 @@ Skype протокол для Miranda NG.
 Добавить

 [Enter password]

 Введите пароль

-[Enter a password for skype name %d:]

-Пароль для Skype ID %:

+[Enter a password]

+Введите пароль

 [Remember this session password]

 Запомнить пароль этой сессии

 [Cancel]

@@ -69,12 +69,12 @@ Skype протокол для Miranda NG.
 Часовой пояс:

 [Change password]

 Изменить пароль

-[Old password]

-Старый пароль

-[New password]

-Новый пароль

-[Confirmation]

-Подтвердить

+[Old password:]

+Старый пароль:

+[New password:]

+Новый пароль:

+[Confirmation:]

+Подтвердить:

 [Password:]

 Пароль:

 [Register new account]

@@ -101,35 +101,16 @@ Skype протокол для Miranda NG.
 SkypeKit не инициализирован.

 [SkypeKit did not start.]

 SkypeKit не запустился.

-[LOGOUT_CALLED]

-[HTTPS_PROXY_AUTH_FAILED]

-[SOCKS_PROXY_AUTH_FAILED]

-[P2P_CONNECT_FAILED]

-[SERVER_CONNECT_FAILED]

-[SERVER_OVERLOADED]

-[DB_IN_USE]

 [Invalid skypename]

 Неверный Skype ID

 [Invalid email]

 Неверный e-mail

 [Unacceptable password]

 Недопустимый пароль

-[SKYPENAME_TAKEN]

-[REJECTED_AS_UNDERAGE]

-[NO_SUCH_IDENTITY]

 [Incorrect password]

 Неверный пароль

 [Too many login attempts]

 Слишком много попыток входа

-[PASSWORD_HAS_CHANGED]

-[PERIODIC_UIC_UPDATE_FAILED]

-[DB_DISK_FULL]

-[DB_IO_ERROR]

-[DB_CORRUPT]

-[DB_FAILURE]

-[INVALID_APP_ID]

-[APP_ID_FAILURE]

-[UNSUPPORTED_VERSION]

 [ATO (Account TakeOver) detected, account blocked]

 [Logout from another instance]

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

@@ -159,8 +140,8 @@ SkypeKit не запустился.
 История &пользователя

 [Contact already in your contact list]

 Контакт уже в контакт листе

-[Enter a password for Skype Name %s:]

-Введите пароль для Skype ID %s:

+[Enter a password for %s:]

+Введите пароль для %s:

 [<not specified>]

 <не указано>

 [Male]

@@ -203,11 +184,9 @@ SkypeKit не запустился.
 [%s connection]

 %s подключение

 ;file \protocols\Skype\src\skype_proto.cpp

-[g_skype Name]

 ;file \protocols\Skype\src\skype_utils.cpp

-[NOT_VALIDATED]

 [Validation succeeded]

-

+Валидация пройдена

 [Password is too short]

 Пароль слишком короткий

 [The value exceeds max size limit for the given property]

@@ -229,16 +208,34 @@ SkypeKit не запустился.
 Skype протокол

 [Create conference]

 Создать конференцию

+[Invite contacts to conference]

+Пригласить в конференцию

 [Topic:]

 Тема:

 [Guideline:]

 

 [Creator]

 Создатель

-[Master]

-Мастер

-[Helper]

-Помошник

+[Set &role]

+Установить &роль

+[&Master]

+&Мастер

+[&Helper]

+&Помошник

+[&User]

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

+[&Listener]

+&Слушатель

+[&Add]

+&Добавить

+[&Kick]

+&Выкинуть

+[Outlaw (&ban)]

+Забанить

+[Copy &skypename]

+Копировать &Skype ID

+[Copy room &uri]

+Копировать ID конференции

 [Confirmation:]

 Подтверждение:

 [Create with password]

@@ -246,5 +243,30 @@ Skype протокол
 [Password hint:]

 Подсказка пароля:

 [Users joining as:]

-

-[Enable joining]
\ No newline at end of file
+Пользователь входит как:

+[Enable joining]

+Разрешить добавления в чат

+[Set bookmark]

+В закладках

+[Bookmarks]

+Закладки

+[Bookmark]

+Закладка

+[Delete]

+Удалить

+[Ignore]

+Игнорировать

+[Block]

+Заблокировать

+[Skype bookmarks]

+Закладки Skype

+[Server side bookmarks\nControl conference bookmarks on server.]

+Закладки на сервере\nХранить чат-комнаты и ссылки на сервере.

+[Name]

+Имя

+[Conferences]

+Конференции

+[The password is incorrect]

+Пароль неверен

+[Your application to join the conference was denied]

+Ваша просьба о присоеденении к конференции отклонена
\ No newline at end of file