From 7ce4891be1ecb40c9e4ecae68cdcfef586bd7b6c Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Thu, 29 May 2014 13:59:15 +0000
Subject: - langpacks/english: update; - langpacks/russian: update;

git-svn-id: http://svn.miranda-ng.org/main/trunk@9344 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 langpacks/english/Plugins/Clist_modern.txt | 20 +++++++++-----------
 langpacks/english/Plugins/Facebook.txt     |  7 +++++--
 langpacks/english/Plugins/Twitter.txt      |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'langpacks/english')

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.]
-- 
cgit v1.2.3