- langpacks/english: update;

- langpacks/russian: update;






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

6 files changed, 37 insertions, 36 deletions

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index f05e9254e1..5ac017084c 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -182,14 +182,13 @@
 [Always show status in tooltip]

 [Disable icon blinking]

 [ms, delay between icon blinking]

-[Show]

-[Cycle icons every]

-[seconds, when statuses differ]

-[Show multiple icons]

-[only when statuses differ]

 [System tray icon]

-[System tray icon mode]

 [Use xStatus icon]

+[Icon mode]

+[Global status]

+[Single account]

+[Cycle icons every]

+[All accounts]

 [Ignore empty extra icons places (arrange to right).]

 [Use 'Meta' protocol icons for MetaContacts]

 [Expand MetaContacts]

@@ -405,7 +404,6 @@
 [Account name]

 [Rate]

 [-Nothing-]

-[Global]

 [Hide to tray]

 [Behind left edge]

 [Behind right edge]

@@ -422,10 +420,10 @@
 [Low]

 [Medium]

 [High]

-[Contact rate none]

-[Contact rate low]

-[Contact rate medium]

-[Contact rate high]

+[Contact rate: none]

+[Contact rate: low]

+[Contact rate: medium]

+[Contact rate: high]

 [Show even if offline]

 ;file \plugins\Clist_modern\src\modern_clistopts.cpp

 [Avatar]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 68f116d7d3..3b05f4a1cd 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Facebook.dll

 ;  Plugin: Facebook RM

-;  Version: 0.2.5.1

+;  Version: 0.2.6.0

 ;  Authors: Michal Zelinka, Robert Pösel

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

 [Facebook protocol support for Miranda NG.]

@@ -28,7 +28,8 @@
 [Event notifications]

 [Notifications]

 [News feeds]

-[News Feed types to notify:]

+[News feed types to notify:]

+[Don't show advertising posts]

 [Other events]

 [Client notifications]

 [Preview]

@@ -46,6 +47,8 @@
 [Message sessions]

 [Keep messages as unread on server (don't send "seen" info)]

 [Receive messages from "inbox" folder only]

+[Load last messages on opening message window (EXPERIMENTAL)]

+[Number of messages to load:]

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

 [&Invite user...]

 [&Leave chat session]

diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt
index b68fe17b2e..950162db23 100644
--- a/langpacks/english/Plugins/Twitter.txt
+++ b/langpacks/english/Plugins/Twitter.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Twitter.dll

 ;  Plugin: Twitter protocol

-;  Version: 1.1.0.1

+;  Version: 1.1.0.2

 ;  Authors: dentist, omniwolf, Thief

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

 [Twitter protocol support for Miranda NG.]

diff --git a/langpacks/russian/Plugins/Clist_modern.txt b/langpacks/russian/Plugins/Clist_modern.txt
index 117a2b68e3..dbf23095de 100644
--- a/langpacks/russian/Plugins/Clist_modern.txt
+++ b/langpacks/russian/Plugins/Clist_modern.txt
@@ -357,22 +357,20 @@ Ctrl+Левый клик вкл. фильтр по протоколу, клик
 Выключить мигание

 [ms, delay between icon blinking]

 мс, между миганиями значка

-[Show]

-Показать

-[Cycle icons every]

-Менять каждые

-[seconds, when statuses differ]

-секунд, при разных статусах

-[Show multiple icons]

-Несколько значков

-[only when statuses differ]

-при разных статусах

 [System tray icon]

 Значок в трее

-[System tray icon mode]

-Поведение значка в системном трее

 [Use xStatus icon]

 Значок xСтатуса

+[Icon mode]

+Режим значка в трее

+[Global status]

+Глобальный статус

+[Single account]

+Одна учётная запись

+[Cycle icons every]

+Менять каждые

+[All accounts]

+Все учёиные записи

 [Ignore empty extra icons places (arrange to right).]

 Игнорировать пустые дополнительные значки (справа)

 [Use 'Meta' protocol icons for MetaContacts]

@@ -799,8 +797,6 @@ Ctrl+Левый клик вкл. фильтр по протоколу, клик
 Рейтинг

 [-Nothing-]

 -Ничего-

-[Global]

-Глобальные

 [Hide to tray]

 В трей

 [Behind left edge]

@@ -829,13 +825,13 @@ Ctrl+Левый клик вкл. фильтр по протоколу, клик
 Средний

 [High]

 Высокий

-[Contact rate none]

+[Contact rate: none]

 Контакт без рейтинга

-[Contact rate low]

+[Contact rate: low]

 Низкий рейтинг контакта

-[Contact rate medium]

+[Contact rate: medium]

 Средний рейтинг контакта

-[Contact rate high]

+[Contact rate: high]

 Высокий рейтинг контакта

 [Show even if offline]

 Показывать, даже если не в сети

diff --git a/langpacks/russian/Plugins/Facebook.txt b/langpacks/russian/Plugins/Facebook.txt
index 474fc9d336..4992c67e3d 100644
--- a/langpacks/russian/Plugins/Facebook.txt
+++ b/langpacks/russian/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Facebook.dll

 ;  Plugin: Facebook RM

-;  Version: 0.2.5.1

+;  Version: 0.2.6.0

 ;  Authors: Michal Zelinka, Robert Pösel

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

 [Facebook protocol support for Miranda NG.]

@@ -51,6 +51,8 @@ URL:
 Новости

 [News feed types to notify:]

 Уведомлять о типах новостей:

+[Don't show advertising posts]

+Не показывать рекламные публикации

 [Other events]

 Другие события

 [Client notifications]

@@ -85,6 +87,10 @@ URL:
 Не помечать сообщения на сервере как прочитанные

 [Receive messages from "inbox" folder only]

 Принимать сообщения только из папки "входящие"

+[Load last messages on opening message window (EXPERIMENTAL)]

+Загружать последние сообщения при открытии окна (Экспериментально)

+[Number of messages to load:]

+Количество загружаемых сообщений:

 [&Invite user...]

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

 [&Leave chat session]

@@ -269,5 +275,3 @@ URL:
 Проверить запросы дружбы

 [Check Newsfeeds]

 Проверить новости

-[Don't show advertising posts]

-Не показывать рекламные публикации
\ No newline at end of file
diff --git a/langpacks/russian/Plugins/Twitter.txt b/langpacks/russian/Plugins/Twitter.txt
index 0767cef951..6505be8399 100644
--- a/langpacks/russian/Plugins/Twitter.txt
+++ b/langpacks/russian/Plugins/Twitter.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Twitter.dll

 ;  Plugin: Twitter protocol

-;  Version: 1.1.0.1

+;  Version: 1.1.0.2

 ;  Authors: dentist, omniwolf, Thief

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

 [Twitter protocol support for Miranda NG.]