9 files changed, 178 insertions, 148 deletions
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 5cd1ef7d92..e5d153081e 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -91,8 +91,12 @@
 [Error occurred when removing contact from server.]
 [Request for friendship was sent.]
 [Error occurred when requesting friendship.]
+[Request for friendship was accepted.]
+[Error occurred when accepting friendship request.]
 [Request for friendship was canceled.]
 [Error occurred when canceling friendship request.]
+[Request for friendship was ignored.]
+[Error occurred when ignoring friendship request.]
 ;file \protocols\FacebookRM\src\dialogs.cpp
 [Default]
 [<< Contacts]
@@ -153,6 +157,7 @@
 [Cancel friendship request]
 [Request friendship]
 [Approve friendship]
+[Deny friendship request]
 [Services...]
 [Refresh Buddy List]
 [Services]
diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index 02e66a3631..b9dff12fbf 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MSN.dll
 ;  Plugin: MSN protocol
-;  Version: 0.11.0.2
+;  Version: 0.11.0.3
 ;  Authors: Boris Krasnovskiy, George Hazan, Richard Hughes
 ;============================================================
 [Microsoft Network (MSN) protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index 29ff93062d..8f75ba4f8a 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Notifies you when a contact changes his/her (X)status or status message.]
 ;file \plugins\NewXstatusNotify\res\resource.rc
-[Notify when a contact changes to one of these statuses]
+[Notify when contact changes to one of these statuses]
 [Online]
 [Offline]
 [Invisible]
@@ -22,18 +22,16 @@
 [Plugin activation]
 [Automatically turn off Popups and Sounds on status change]
 [Configure]
-[Notify me for people not in my Contact List]
+[Notify me for people not on my contact list]
 [Blink icon in the system tray]
 [Use status icon]
 [Use individual sounds]
 [Log to file]
-[Enable]
 [Extra status]
 [Open]
 [Status message]
-[Log in history]
-[Log status changes in history]
-[Only when message window is open]
+[Also when extra status or status message changes]
+[Notify when contact changes]
 [Change]
 [Preview]
 [Delete]
@@ -47,6 +45,8 @@
 [Extra status logging]
 [Disable all]
 [Enable all]
+[Status message notify]
+[Status message logging]
 [Background]
 [Text]
 [Colors]
@@ -67,51 +67,70 @@
 [On left click]
 [On right click]
 [Show status description]
-[Ignore empty status and xStatus messages]
 [Connection timeout]
 [Notification]
 [Disable for extra status 'Music']
 [Truncate message length to:]
 [characters]
 [Templates]
-[Title - text delimiter:]
-[Remove:]
-[New message:]
-[New status:]
+[Template:]
+[Notify when contact removes extra status]
+[Notify when contact changes extra status message]
+[Notify when contact changes extra status]
 [Variables]
 [Reset]
+[Notify when contact removes extra status message]
+[Show Popups when I connect]
 [Disable notifications]
 [Cancel]
 [Disable globally]
 [Disable only if I change global status]
 [Disable when my status is:]
-[Extra status log]
-[Enable logging extra status to message window]
-[Keep events in history]
-[Prevent identical logs]
-[On opening ML:]
+[Log extra status changes]
+[Log extra status changes to file]
+[Only when message window is open]
+[Log extra status changes to history]
+[Remove events from history when closing message window]
+[Log when contact removes extra status]
+[Log when contact changes extra status message]
+[Log when contact changes extra status]
+[Log extra status when opening message window]
+[Log when contact removes extra status message]
 [General]
-[Show Popups when I connect]
 [Accounts]
 [Enable/Disable accounts which you don't wish to be notified for:]
+[Notify when contact changes status message]
+[Notify when contact removes status message]
+[Log status changes]
+[Log status changes to file]
+[Log status changes to history]
+[Log previous status too]
+[Log status message changes]
+[Log status message changes to file]
+[Log status message changes to history]
+[Log when contact changes status message]
+[Log when contact removes status message]
+[Log status message when opening message window]
 ;file \plugins\NewXstatusNotify\src\indsnd.cpp
 [Sound files]
 [All files]
 [Wave files]
 [Status]
-[Sound for the status]
-[From offline]
+[Sound file]
 [** All contacts **]
 ;file \plugins\NewXstatusNotify\src\indsnd.h
 [(default sound)]
 ;file \plugins\NewXstatusNotify\src\main.cpp
 [<no status message>]
 [Contact]
+[<unknown>]
+[%s is now %s]
+[%s, %s. %s changed status to %s (was %s)\r\n]
 [connecting]
 [aborting]
 [playing]
-[%s is now %s]
-[%s, %s. %s changed to: %s (was: %s).\r\n]
+[%s changed status message to %s]
+[%s, %s. %s %s\r\n]
 [(M) is back online!]
 [(F) is back online!]
 [(U) is back online!]
@@ -127,51 +146,56 @@
 [(M) feels talkative!]
 [(F) feels talkative!]
 [(U) feels talkative!]
-[User: Free For Chat]
-[(M) went Away]
-[(F) went Away]
-[(U) went Away]
+[User: Free for chat]
+[(M) went away]
+[(F) went away]
+[(U) went away]
 [User: Away]
 [(M) isn't there anymore!]
 [(F) isn't there anymore!]
 [(U) isn't there anymore!]
-[User: Not Available]
-[(M) has something else to do.]
-[(F) has something else to do.]
-[(U) has something else to do.]
+[User: Not available]
+[(M) has something else to do]
+[(F) has something else to do]
+[(U) has something else to do]
 [User: Occupied]
 [(M) doesn't want to be disturbed!]
 [(F) doesn't want to be disturbed!]
 [(U) doesn't want to be disturbed!]
-[User: Do Not Disturb]
+[User: Do not disturb]
 [(M) is eating something]
 [(F) is eating something]
 [(U) is eating something]
-[User: Out To Lunch]
+[User: Out to lunch]
 [(M) had to answer the phone]
 [(F) had to answer the phone]
 [(U) had to answer the phone]
-[User: On The Phone]
+[User: On the phone]
+[User: from offline (has priority!)]
+[Status message removed]
+[Status message changed]
+[Extra status removed]
+[Extra status message changed]
+[Extra status changed]
+[Extra status message removed]
 [Enable status notification]
 [Disable status notification]
 [Notification enabled]
 [Notification disabled]
 [New Status Notify]
-[User: from offline (has priority!)]
-[Extra status changed]
-[Extra status message changed]
-[Extra status removed]
 [Toggle status notification]
 [Status change]
 ;file \plugins\NewXstatusNotify\src\options.cpp
 [All Files]
 [Log]
 [This is status message]
-[Do you want to reset all templates to default?]
-[Reset templates]
+[This is extra status]
 [Show available variables]
 [Reset all templates to default]
+[Do you want to reset all templates to default?]
+[Reset templates]
 [Protocol]
+[Logging]
 [Filtering]
 [Message log]
 ;file \plugins\NewXstatusNotify\src\popup.h
@@ -183,23 +207,25 @@
 [Open contact history]
 [Do nothing]
 ;file \plugins\NewXstatusNotify\src\utils.cpp
-[You cannot specify a value lower than %d and higher than %d.]
 [Can't open the log file!]
 [NewXstatusNotify]
 ;file \plugins\NewXstatusNotify\src\xstatus.cpp
 [Mood]
 [Activity]
 [Xstatus]
-[<unknown>]
-[%s, %s. %s removed %s.\r\n]
-[%s, %s. %s changed %s to: %s.\r\n]
+[<no title>]
+[%s changed %s]
 ;file \plugins\NewXstatusNotify\src\xstatus.h
-[changed %N to: %T%D%I]
-[changed %N message to:%D%I]
-[removed %N]
-[changed his/her status message to %n]
-[changed %N @ %T%D%I]
-[changed %N message @ %I]
-[has %N @ %T%D%I]
-[These variables are available:\r\n\r\n%N\textra status name (Xstatus, Mood, Activity)\r\n%T\textra status title\r\n%I\textra status text\r\n%D\tdelimiter\r\n%B\tline break (can be used as delimiter)]
-[These variables are available:\r\n\r\n%n\tNew Status Message\r\n%o\tOld Status Message\r\n%c\tCustom Nickname\r\n\\n\tline break\r\n\\t\ttab stop]
+[changed %n to: %t]
+[removed %n]
+[changed %n message to: %m]
+[removed %n message]
+[changed status message to: %n]
+[removed status message]
+[changed %n @ %t: %m]
+[changed %n message @ %m]
+[has %n @ %t: %m]
+[changed status message @ %n]
+[is %s and has status message @ %n]
+[These variables are available:\r\n\r\n%n\textra status name (Xstatus, Mood, Activity)\r\n%t\textra status title\r\n%m\textra status message\r\n%c\tcustom nickname\r\n\\n\tline break\r\n\\t\ttab stop]
+[These variables are available:\r\n\r\n%n\tnew status message\r\n%o\told status message\r\n%c\tcustom nickname\r\n%s\tcurrent status\r\n\\n\tline break\r\n\\t\ttab stop]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index b2c19cd320..5fcbf40f68 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.3.1.7
+;  Version: 3.4.0.1
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [IM and group chat module for Miranda NG.]
diff --git a/langpacks/russian/Plugins/MSN.txt b/langpacks/russian/Plugins/MSN.txt
index abe76c22c7..144a2f315b 100644
--- a/langpacks/russian/Plugins/MSN.txt
+++ b/langpacks/russian/Plugins/MSN.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MSN.dll
 ;  Plugin: MSN protocol
-;  Version: 0.11.0.2
+;  Version: 0.11.0.3
 ;  Authors: Boris Krasnovskiy, George Hazan, Richard Hughes
 ;============================================================
 [Microsoft Network (MSN) protocol support for Miranda NG.]
diff --git a/langpacks/russian/Plugins/NewXstatusNotify.txt b/langpacks/russian/Plugins/NewXstatusNotify.txt
index adb76d7983..de33677690 100644
--- a/langpacks/russian/Plugins/NewXstatusNotify.txt
+++ b/langpacks/russian/Plugins/NewXstatusNotify.txt
@@ -7,8 +7,6 @@
 ;============================================================
 [Notifies you when a contact changes his/her (X)status or status message.]
 Уведомляет вас об изменениях статусов, xСтатусов или статусных сообщений контактов.
-[Notify when a contact changes to one of these statuses]
-Сообщать, когда статус контакта изменяется на:
 [Online]
 В сети
 [Offline]
@@ -37,8 +35,6 @@
 Выключать всплывающие окна и звуки при изменении статуса
 [Configure]
 Настроить
-[Notify me for people not in my Contact List]
-Уведомлять меня о контактах не из списка контактов
 [Blink icon in the system tray]
 Мигающий значок в сист. панели
 [Use status icon]
@@ -47,20 +43,12 @@
 Индивидуальные звуки
 [Log to file]
 Запись в файл
-[Enable]
-Включено
 [Extra status]
 xСтатус
 [Open]
 Открыть
 [Status message]
 Сообщение статуса
-[Log in history]
-Запись в историю
-[Log status changes in history]
-Записывать изменения статусов в историю
-[Only when message window is open]
-Только если открыто окно сообщений
 [Change]
 Изменить
 [Preview]
@@ -127,8 +115,6 @@ xСтатус
 Правый щелчок
 [Show status description]
 Показывать описание статуса
-[Ignore empty status and xStatus messages]
-Игнорировать пустые сообщения
 [Connection timeout]
 Таймаут на старте
 [Notification]
@@ -141,18 +127,12 @@ xСтатус
 символов
 [Templates]
 Шаблоны
-[Title - text delimiter:]
-Разделитель заголовка - текста:
-[Remove:]
-Удаление:
-[New message:]
-Новое сообщение:
-[New status:]
-Новый статус:
 [Variables]
 Переменные
 [Reset]
 Сброс
+[Show Popups when I connect]
+Окна при подключении
 [Disable notifications]
 Выключить уведомления
 [Cancel]
@@ -163,20 +143,10 @@ xСтатус
 Отключать, только при изменении глобального статуса
 [Disable when my status is:]
 Отключать, когда мой статсус:
-[Extra status log]
-Запись xСтатусов
-[Enable logging extra status to message window]
-Включить запись xСтатусов в окно сообщений
-[Keep events in history]
-Сохранять события в историю
-[Prevent identical logs]
-Предотвращать одинаковые записи
-[On opening ML:]
-Открытие окна:
+[Only when message window is open]
+Только если открыто окно сообщений
 [General]
 Общее
-[Show Popups when I connect]
-Окна при подключении
 [Accounts]
 Учётные записи
 [Enable/Disable accounts which you don't wish to be notified for:]
@@ -189,10 +159,6 @@ xСтатус
 Файлы Wave
 [Status]
 Статус
-[Sound for the status]
-Звук для статуса
-[From offline]
-Из оффлайна
 [** All contacts **]
 ** Все контакты **
 [(default sound)]
@@ -201,16 +167,16 @@ xСтатус
 <нет сообщения статуса>
 [Contact]
 Контакт
+[<unknown>]
+<неизвестно>
+[%s is now %s]
+%s сейчас %s
 [connecting]
 подключается
 [aborting]
 отключается
 [playing]
 играет
-[%s is now %s]
-%s сейчас %s
-[%s, %s. %s changed to: %s (was: %s).\r\n]
-%s, %s. %s изменил(а): %s (был(а): %s).\r\n
 [(M) is back online!]
 снова в сети!
 [(F) is back online!]
@@ -241,13 +207,13 @@ xСтатус
 готова поболтать!
 [(U) feels talkative!]
 готов(а) поболтать!
-[User: Free For Chat]
+[User: Free for chat]
 Пользователь: готов болтать
-[(M) went Away]
+[(M) went away]
 отошёл
-[(F) went Away]
+[(F) went away]
 отошла
-[(U) went Away]
+[(U) went away]
 отошёл
 [User: Away]
 Пользователь: отсутствует
@@ -257,14 +223,8 @@ xСтатус
 отсутствует!
 [(U) isn't there anymore!]
 отсутствует!
-[User: Not Available]
+[User: Not available]
 Пользователь: недоступен
-[(M) has something else to do.]
-занят чем-то другим.
-[(F) has something else to do.]
-занята чем-то другим.
-[(U) has something else to do.]
-занят чем-то другим.
 [User: Occupied]
 Пользователь: занят
 [(M) doesn't want to be disturbed!]
@@ -273,7 +233,7 @@ xСтатус
 не хотела бы, чтобы её беспокоили!
 [(U) doesn't want to be disturbed!]
 не хотел бы, чтобы его беспокоили!
-[User: Do Not Disturb]
+[User: Do not disturb]
 Пользователь: не беспокоить
 [(M) is eating something]
 что-то ест
@@ -281,7 +241,7 @@ xСтатус
 что-то ест
 [(U) is eating something]
 что-то ест
-[User: Out To Lunch]
+[User: Out to lunch]
 Пользователь: обедает
 [(M) had to answer the phone]
 говорит по телефону
@@ -289,8 +249,16 @@ xСтатус
 говорит по телефону
 [(U) had to answer the phone]
 говорит по телефону
-[User: On The Phone]
+[User: On the phone]
 Пользователь: на телефоне
+[User: from offline (has priority!)]
+Пользователь:  из оффлайна (имеет приоритет!)
+[Extra status removed]
+xСтатус удален
+[Extra status message changed]
+Изменено сообщение xСтатуса
+[Extra status changed]
+xСтатус изменен
 [Enable status notification]
 Включить уведомления о смене статуса
 [Disable status notification]
@@ -301,14 +269,6 @@ xСтатус
 Уведомление выключено
 [New Status Notify]
 Смена статуса
-[User: from offline (has priority!)]
-Пользователь:  из оффлайна (имеет приоритет!)
-[Extra status changed]
-xСтатус изменен
-[Extra status message changed]
-Изменено сообщение xСтатуса
-[Extra status removed]
-xСтатус удален
 [Toggle status notification]
 Вкл/Выкл уведомления о смене статуса
 [Status change]
@@ -319,14 +279,14 @@ xСтатус удален
 Журнал
 [This is status message]
 Это сообщение статуса
-[Do you want to reset all templates to default?]
-Вы хотите сбросить все шаблоны на стандартные?
-[Reset templates]
-Сбросить шаблоны
 [Show available variables]
 Доступные переменные
 [Reset all templates to default]
 Сбросить все шаблоны на стандартные
+[Do you want to reset all templates to default?]
+Вы хотите сбросить все шаблоны на стандартные?
+[Reset templates]
+Сбросить шаблоны
 [Protocol]
 Протокол
 [Filtering]
@@ -347,8 +307,6 @@ xСтатус удален
 Открыть историю контакта
 [Do nothing]
 Ничего не делать
-[You cannot specify a value lower than %d and higher than %d.]
-Значение меньшее %d или большее %d не допускается.
 [Can't open the log file!]
 Не могу открыть файл журнала!
 [NewXstatusNotify]
@@ -359,27 +317,5 @@ xСтатус удален
 Занятие
 [Xstatus]
 хСтатус
-[<unknown>]
-<неизвестно>
-[%s, %s. %s removed %s.\r\n]
-%s, %s. %s удалил(а) %s.\r\n
-[%s, %s. %s changed %s to: %s.\r\n]
-%s, %s. %s изменил(а) %s на: %s.\r\n
-[changed %N to: %T%D%I]
-изменил(а) %N на: %T%D%I
-[changed %N message to:%D%I]
-изменил(а) сообщение %N на:%D%I
-[removed %N]
+[removed %n]
 удалил(а) %N
-[changed his/her status message to %n]
-сменил(а) статусное сообщение на %n
-[changed %N @ %T%D%I]
-изменил(а) %N @ %T%D%I
-[changed %N message @ %I]
-изменил(а) сообщение %N @ %I
-[has %N @ %T%D%I]
-%N @ %T%D%I
-[These variables are available:\r\n\r\n%N\textra status name (Xstatus, Mood, Activity)\r\n%T\textra status title\r\n%I\textra status text\r\n%D\tdelimiter\r\n%B\tline break (can be used as delimiter)]
-Доступные переменные:\r\n\r\n%N\tназвание xСтатуса (хСтатус, Настроение, Занятие)\r\n%T\tзаголовок xСтатуса\r\n%I\tтекст xСтатуса\r\n%D\tразделитель\r\n%B\tразрыв строки (может использоваться как разделитель)
-[These variables are available:\r\n\r\n%n\tNew Status Message\r\n%o\tOld Status Message\r\n%c\tCustom Nickname\r\n\\n\tline break\r\n\\t\ttab stop]
-Доступные переменные:\r\n\r\n%n\tНовое сообщение статуса\r\n%o\tСтарое сообщение статуса\r\n%c\tНикнейм\r\n\\n\tРазрыв строки\r\n\\t\tТабуляция
diff --git a/langpacks/russian/Plugins/TabSRMM.txt b/langpacks/russian/Plugins/TabSRMM.txt
index d20862acb3..fc1936941c 100644
--- a/langpacks/russian/Plugins/TabSRMM.txt
+++ b/langpacks/russian/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.3.1.7
+;  Version: 3.4.0.1
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [IM and group chat module for Miranda NG.]
diff --git a/langpacks/russian/Untranslated/Facebook.txt b/langpacks/russian/Untranslated/Facebook.txt
index 4d2147c4cb..d511655118 100644
--- a/langpacks/russian/Untranslated/Facebook.txt
+++ b/langpacks/russian/Untranslated/Facebook.txt
@@ -1 +1,6 @@
 [URL:]
+[Request for friendship was accepted.]
+[Error occurred when accepting friendship request.]
+[Request for friendship was ignored.]
+[Error occurred when ignoring friendship request.]
+[Deny friendship request]
diff --git a/langpacks/russian/Untranslated/NewXstatusNotify.txt b/langpacks/russian/Untranslated/NewXstatusNotify.txt
new file mode 100644
index 0000000000..2b9d6e7125
--- /dev/null
+++ b/langpacks/russian/Untranslated/NewXstatusNotify.txt
@@ -0,0 +1,58 @@
+[Notify when contact changes to one of these statuses]
+[Notify me for people not on my contact list]
+[Also when extra status or status message changes]
+[Notify when contact changes]
+[Status message notify]
+[Status message logging]
+[Template:]
+[Notify when contact removes extra status]
+[Notify when contact changes extra status message]
+[Notify when contact changes extra status]
+[Notify when contact removes extra status message]
+[Log extra status changes]
+[Log extra status changes to file]
+[Log extra status changes to history]
+[Remove events from history when closing message window]
+[Log when contact removes extra status]
+[Log when contact changes extra status message]
+[Log when contact changes extra status]
+[Log extra status when opening message window]
+[Log when contact removes extra status message]
+[Notify when contact changes status message]
+[Notify when contact removes status message]
+[Log status changes]
+[Log status changes to file]
+[Log status changes to history]
+[Log previous status too]
+[Log status message changes]
+[Log status message changes to file]
+[Log status message changes to history]
+[Log when contact changes status message]
+[Log when contact removes status message]
+[Log status message when opening message window]
+[Sound file]
+[%s, %s. %s changed status to %s (was %s)\r\n]
+[%s changed status message to %s]
+[%s, %s. %s %s\r\n]
+[(M) has something else to do]
+[(F) has something else to do]
+[(U) has something else to do]
+[Status message removed]
+[Status message changed]
+[Extra status message removed]
+[This is extra status]
+[Logging]
+[<no title>]
+[%s changed %s]
+[changed %n to: %t]
+[changed %n message to: %m]
+[removed %n message]
+[changed status message to: %n]
+[removed status message]
+[changed %n @ %t: %m]
+[changed %n message @ %m]
+[has %n @ %t: %m]
+[changed status message @ %n]
+[is %s and has status message @ %n]
+[These variables are available:\r\n\r\n%n\textra status name (Xstatus, Mood, Activity)\r\n%t\textra status title\r\n%m\textra status message\r\n%c\tcustom nickname\r\n\\n\tline break\r\n\\t\ttab stop]
+[These variables are available:\r\n\r\n%n\tnew status message\r\n%o\told status message\r\n%c\tcustom nickname\r\n%s\tcurrent status\r\n\\n\tline break\r\n\\t\ttab stop]