10 files changed, 18 insertions, 49 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 0698172679..40934ea63f 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -162,20 +162,6 @@
 [Text effect]
 [Text color]
 [Choose font]
-[Font]
-[&Font:]
-[Font st&yle:]
-[\nStyles and effects are disabled for this font.]
-[&Size:]
-[Effects]
-[Stri&keout]
-[&Underline]
-[&Color:]
-[Sample]
-[AaBbYyZz]
-[Sc&ript:]
-[&Apply]
-[&Help]
 [Menu objects]
 [Menu items]
 [Protocol menus]
@@ -239,6 +225,7 @@
 [Move &up]
 [Move &down]
 [Send &offline]
+[&Apply]
 [Context menu]
 [Use contact's unique ID]
 [Use contact's display name]
@@ -313,6 +300,7 @@
 [&Emoticons]
 [&Bold]
 [&Italic]
+[&Underline]
 [&Color]
 [&Background color]
 [&History]
@@ -920,6 +908,7 @@
 ;file \src\core\stdhelp\src\about.cpp
 [< Copyright]
 ;file \src\core\stdhelp\src\help.cpp
+[&Help]
 [&About...]
 [&Support]
 [&Miranda NG homepage]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index ed21db27bf..f5e17990af 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.10.3
+;  Version: 0.2.10.4
 ;  Authors: Michal Zelinka, Robert Pösel
 ;============================================================
 [Facebook protocol support for Miranda NG.]
@@ -33,6 +33,7 @@
 [Other events]
 [Client notifications]
 [Friendship notifications]
+[Ticker feeds]
 [Use this server for opening links:]
 [Use balloon notifications in system tray instead of popups]
 [Use logging notifications into special chatroom]
@@ -116,6 +117,7 @@
 [Sample newsfeed]
 [Sample notification]
 [Sample friendship]
+[Sample ticker]
 ;file \protocols\FacebookRM\src\json.cpp
 [a sticker]
 [files]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 056fa25d19..1dfd6555af 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -1038,7 +1038,6 @@
 [sent unknown presence type]
 [Nick:]
 [Status:]
-[Status text:]
 [Real JID:]
 ;file \protocols\JabberG\src\jabber_thread.cpp
 [Enter password for %s]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 1eb6d1af94..c721114562 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.4.0.8
+;  Version: 3.4.0.9
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [IM and group chat module for Miranda NG.]
diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt
index 0da501bfe9..8ea2dcaa42 100644
--- a/langpacks/russian/=CORE=.txt
+++ b/langpacks/russian/=CORE=.txt
@@ -319,32 +319,6 @@
 Цвет текста
 [Choose font]
 Выбор шрифта
-[Font]
-Шрифт
-[&Font:]
-&Шрифт:
-[Font st&yle:]
-Ст&иль шрифта:
-[\nStyles and effects are disabled for this font.]
-\nДля этого шрифта настройка стилей и эффектов отключена.
-[&Size:]
-&Размер:
-[Effects]
-Эффекты
-[Stri&keout]
-Заче&ркнутый
-[&Underline]
-&Подчеркнутый
-[&Color:]
-&Цвет:
-[Sample]
-Пример
-[Sc&ript:]
-Ск&рипт:
-[&Apply]
-&Применить
-[&Help]
-&Справка
 [Menu objects]
 Виды меню
 [Menu items]
@@ -471,6 +445,8 @@ Miranda NG перезапускается.\nПожалуйста, подожди
 &Вниз
 [Send &offline]
 В &оффлайн
+[&Apply]
+&Применить
 [Context menu]
 Контекстное меню
 [Use contact's unique ID]
@@ -613,6 +589,8 @@ UIN, E-mail и т.д.
 &Жирный
 [&Italic]
 &Курсив
+[&Underline]
+&Подчеркнутый
 [&Color]
 &Цвет
 [&Background color]
@@ -1765,6 +1743,8 @@ UIN, E-mail и т.д.
 Исходящие
 [< Copyright]
 < Права
+[&Help]
+&Справка
 [&About...]
 &О программе...
 [&Support]
diff --git a/langpacks/russian/Plugins/Facebook.txt b/langpacks/russian/Plugins/Facebook.txt
index 3b3cf22c26..728878e240 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.10.3
+;  Version: 0.2.10.4
 ;  Authors: Michal Zelinka, Robert Pösel
 ;============================================================
 [Facebook protocol support for Miranda NG.]
diff --git a/langpacks/russian/Plugins/Jabber.txt b/langpacks/russian/Plugins/Jabber.txt
index a4dd9e98fc..0840f1f919 100644
--- a/langpacks/russian/Plugins/Jabber.txt
+++ b/langpacks/russian/Plugins/Jabber.txt
@@ -1715,8 +1715,6 @@ XML для MS Excel (кодировка UTF-8)
 Ник:
 [Status:]
 Статус:
-[Status text:]
-Текст статуса:
 [Real JID:]
 Реальный JID:
 [Enter password for %s]
diff --git a/langpacks/russian/Plugins/TabSRMM.txt b/langpacks/russian/Plugins/TabSRMM.txt
index 615fade723..a3d838bf48 100644
--- a/langpacks/russian/Plugins/TabSRMM.txt
+++ b/langpacks/russian/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.4.0.8
+;  Version: 3.4.0.9
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [IM and group chat module for Miranda NG.]
diff --git a/langpacks/russian/Untranslated/=CORE=.txt b/langpacks/russian/Untranslated/=CORE=.txt
index 262a3a9f0a..849b5f2cff 100644
--- a/langpacks/russian/Untranslated/=CORE=.txt
+++ b/langpacks/russian/Untranslated/=CORE=.txt
@@ -1,5 +1,4 @@
-[AaBbYyZz]
-[&E-mail]
+[&E-mail]
 [ID]
 [Ctrl + ]
 [Alt + ]
diff --git a/langpacks/russian/Untranslated/Facebook.txt b/langpacks/russian/Untranslated/Facebook.txt
index 4d2147c4cb..b01a4c6b20 100644
--- a/langpacks/russian/Untranslated/Facebook.txt
+++ b/langpacks/russian/Untranslated/Facebook.txt
@@ -1 +1,3 @@
 [URL:]
+[Ticker feeds]
+[Sample ticker]