summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--langpacks/english/=CORE=.txt2
-rw-r--r--langpacks/english/Plugins/AIM.txt2
-rw-r--r--langpacks/english/Plugins/AVS.txt2
-rw-r--r--langpacks/english/Plugins/Clist_modern.txt2
-rw-r--r--langpacks/english/Plugins/Clist_nicer.txt12
-rw-r--r--langpacks/english/Plugins/Contacts.txt1
-rw-r--r--langpacks/english/Plugins/Facebook.txt4
-rw-r--r--langpacks/english/Plugins/FileAsMessage.txt2
-rw-r--r--langpacks/english/Plugins/Msg_Export.txt6
-rw-r--r--langpacks/english/Plugins/Popup.txt12
-rw-r--r--langpacks/english/Plugins/SendSS.txt2
-rw-r--r--langpacks/english/Plugins/Tipper.txt2
-rw-r--r--langpacks/english/Plugins/TooltipNotify.txt5
-rw-r--r--langpacks/english/Plugins/Tox.txt2
-rw-r--r--langpacks/english/Plugins/Yahoo.txt4
-rw-r--r--langpacks/russian/=CORE=.txt4
-rw-r--r--langpacks/russian/Plugins/AIM.txt2
-rw-r--r--langpacks/russian/Plugins/AVS.txt2
-rw-r--r--langpacks/russian/Plugins/Clist_modern.txt4
-rw-r--r--langpacks/russian/Plugins/Clist_nicer.txt18
-rw-r--r--langpacks/russian/Plugins/Contacts.txt2
-rw-r--r--langpacks/russian/Plugins/Facebook.txt4
-rw-r--r--langpacks/russian/Plugins/FileAsMessage.txt2
-rw-r--r--langpacks/russian/Plugins/Msg_Export.txt2
-rw-r--r--langpacks/russian/Plugins/Popup.txt12
-rw-r--r--langpacks/russian/Plugins/SendSS.txt2
-rw-r--r--langpacks/russian/Plugins/Tipper.txt2
-rw-r--r--langpacks/russian/Plugins/TooltipNotify.txt10
-rw-r--r--langpacks/russian/Plugins/Tox.txt2
-rw-r--r--langpacks/russian/Plugins/Yahoo.txt4
-rw-r--r--langpacks/russian/Untranslated/AIM.txt1
-rw-r--r--langpacks/russian/Untranslated/AVS.txt1
-rw-r--r--langpacks/russian/Untranslated/Facebook.txt1
-rw-r--r--langpacks/russian/Untranslated/FileAsMessage.txt1
-rw-r--r--langpacks/russian/Untranslated/Msg_Export.txt5
-rw-r--r--langpacks/russian/Untranslated/Popup.txt3
-rw-r--r--langpacks/russian/Untranslated/SendSS.txt1
-rw-r--r--langpacks/russian/Untranslated/Tipper.txt1
-rw-r--r--langpacks/russian/Untranslated/Yahoo.txt2
39 files changed, 65 insertions, 83 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 753ac61236..803ea78a7c 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1276,8 +1276,8 @@
[Could not write unique ID of contact to metacontact]
[Could not write nickname of contact to metacontact]
;file \src\mir_app\src\movetogroup.cpp
-[&Move to group]
[<Root group>]
+[&Move to group]
;file \src\mir_app\src\netliblog.cpp
[Standard Netlib log]
[No times]
diff --git a/langpacks/english/Plugins/AIM.txt b/langpacks/english/Plugins/AIM.txt
index 0ca4687317..8075d1a346 100644
--- a/langpacks/english/Plugins/AIM.txt
+++ b/langpacks/english/Plugins/AIM.txt
@@ -150,7 +150,7 @@
[Open mail account?]
;file \protocols\AimOscar\src\proto.cpp
[%s server connection]
-[%s Client-to-client connection]
+[%s client-to-client connections]
;file \protocols\AimOscar\src\server.cpp
[[Auto-Response]:]
[Contact tried to open an audio/video conference (not currently supported)]
diff --git a/langpacks/english/Plugins/AVS.txt b/langpacks/english/Plugins/AVS.txt
index 636bb1e037..8595fa5c58 100644
--- a/langpacks/english/Plugins/AVS.txt
+++ b/langpacks/english/Plugins/AVS.txt
@@ -10,7 +10,7 @@
[The pictures you can set here are used as default avatars\nfor contacts that don't have their own.\nUse the checkboxes to enable/disable showing avatars for the protocols.]
[Set default picture]
[Delete default picture]
-[CAUTION: These pictures are NOT your own avatars.\nTo set your own avatar go to Main menu -> View/change my details -> Avatars.]
+[CAUTION: These pictures are NOT your own avatars.\nTo set your own avatar go to Main menu -> View/change my details -> Avatar.]
[Try to draw avatar background transparent (for images without transparency)]
[Number of points to define background:]
[Color difference allowed:]
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index ddd1b62e8b..debe5f64bc 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -313,10 +313,10 @@
[&Position]
[&Up]
[&Down]
+[Lock frame]
[Show all frames]
[Show all title bars]
[Hide all title bars]
-[Lock frame]
;file \plugins\Clist_modern\src\groupmenu.cpp
[&Hide/show]
[&Find/add contacts...]
diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index 7a1542eea0..aa0c6b2097 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -12,7 +12,7 @@
[Continue]
[Exit Miranda]
[Although the exception was caught and you may continue working with Miranda, you should restart the program as soon as possible. The exception may have damaged internal data structures and can have a serious impact on stability.]
-[About CList nicer]
+[About Clist nicer]
[Clist nicer]
[Copyright © 2004-2010 by the Miranda IM project, 2012-2015 by the Miranda NG project. More detailed copyright information can be found in the included README file.]
[Version]
@@ -215,7 +215,7 @@
[Appear always offline (block contact)]
[Other]
[Hide this contact from the list]
-[To show a previously hidden contact, navigate to Options -> Events -> Ignore, search the contact in the list and tick the checkbox next to its name.]
+[To show a previously hidden contact, navigate to Options -> Contacts -> Ignore, search the contact in the list and tick the checkbox next to its name.]
[Display options]
[Show contact with priority]
[Show avatar:]
@@ -353,15 +353,15 @@
[&Position]
[&Up]
[&Down]
-[Frames]
-[Show all frames]
-[Show all title bars]
-[Hide all title bars]
[Lock frame]
[Visible]
[Show title bar]
[Skinned frame]
[Floating]
+[Frames]
+[Show all frames]
+[Show all title bars]
+[Hide all title bars]
;file \plugins\Clist_nicer\src\cluiopts.cpp
[Title bar]
[Tool Window]
diff --git a/langpacks/english/Plugins/Contacts.txt b/langpacks/english/Plugins/Contacts.txt
index 01772934e8..fab8c2a2b5 100644
--- a/langpacks/english/Plugins/Contacts.txt
+++ b/langpacks/english/Plugins/Contacts.txt
@@ -30,6 +30,7 @@
;file \plugins\ContactsPlus\src\main.cpp
[Contacts received from]
[Contacts]
+[Events]
[Incoming Contacts]
[Outgoing Contacts]
;file \plugins\ContactsPlus\src\receive.cpp
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 7bc27f6e10..b899a3a04f 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.11.4
+; Version: 0.2.11.6
; Authors: Michal Zelinka, Robert Pösel
;============================================================
[Facebook protocol support for Miranda NG.]
@@ -43,7 +43,7 @@
[Statuses]
[Post Miranda statuses to Wall]
[Turn off chat on Facebook when going to offline in Miranda]
-[Map unsupported statuses to Invisible (instead of Online)]
+[Map unsupported statuses to Invisible (instead of Away)]
[Allow posting statuses to my pages (may slow down login)]
[Bots challenge test]
[Instruction:]
diff --git a/langpacks/english/Plugins/FileAsMessage.txt b/langpacks/english/Plugins/FileAsMessage.txt
index 608634aa52..bf53cf0a47 100644
--- a/langpacks/english/Plugins/FileAsMessage.txt
+++ b/langpacks/english/Plugins/FileAsMessage.txt
@@ -21,7 +21,7 @@
[To send]
[Received]
[Use only alphanumeric encoding on transfer]
-[Extra options: Events > File Transfers, "Receiving files" group]
+[Extra options: Events -> File Transfers, "Receiving files" group]
;file \plugins\FileAsMessage\src\dialog.cpp
[File already exists. Overwrite?]
[Couldn't open a file]
diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt
index 1dae6f801a..0e268784f3 100644
--- a/langpacks/english/Plugins/Msg_Export.txt
+++ b/langpacks/english/Plugins/Msg_Export.txt
@@ -40,12 +40,12 @@
[Set to default filename]
[Copy]
;file \plugins\Msg_Export\src\FileViewer.cpp
-[Failed to write to the RichEdit the buffer was to small.]
+[Failed to write to the Rich Edit the buffer was to small.]
[Error: Optimal buffer size decreased to a too low size!]
[Internal error! (lExtraRead >= 0)]
[Failed to execute external file view]
-[Failed to load Rich Edit ( Msftedit.DLL )]
-[Failed to get handle to RichEdit!]
+[Failed to load Rich Edit (Msftedit.dll)]
+[Failed to get handle to Rich Edit!]
[Failed to open file\r\n%s\r\n\r\nContact handle is invalid]
[Failed to open file\r\n%s\r\n\r\nMiranda database contains %d events]
[With scroll to bottom %d\n]
diff --git a/langpacks/english/Plugins/Popup.txt b/langpacks/english/Plugins/Popup.txt
index 287e077d75..ecd3e15492 100644
--- a/langpacks/english/Plugins/Popup.txt
+++ b/langpacks/english/Plugins/Popup.txt
@@ -7,8 +7,8 @@
;============================================================
[Provides popup notification services for different plugins.]
;file \plugins\Popup\res\resource.rc
-[Content && Style]
-[Go to Customize > Fonts && Colors for fonts and colors options]
+[Content and Style]
+[Go to Customize -> Fonts and Colors for fonts and colors options]
[Miscellaneous]
[Effects]
[Live Preview]
@@ -78,7 +78,7 @@
[Right click action:]
[Disable when global status is...]
[Disable when relevant protocol's status is...]
-[Colors can be configured in\r\nCustomize > Fonts and colors]
+[Colors can be configured in\r\nCustomize -> Fonts and colors]
[More...]
[Disable if message window is open]
[Sec]
@@ -164,7 +164,7 @@
[Toggle Popups]
[Enable Popups]
[Disable Popups]
-[Popup Plus]
+[Popup plus]
[Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
;file \plugins\Popup\src\opt_adv.cpp
[No effect]
@@ -194,7 +194,7 @@
[Protocol Status]
[You cannot specify a value lower than %d and higher than %d.]
['Reorder popups' option is currently disabled.\r\nThis may cause misaligned popups when used with\r\navatars and text replacement (mainly NewXstatusNotify).\r\n\r\nDo you want to enable popup reordering now?\r\n]
-[Popup Plus Warning]
+[Popup plus warning]
;file \plugins\Popup\src\opt_skins.cpp
[Failed to register %s class.]
[Skin preview]
@@ -214,7 +214,7 @@
;file \plugins\Popup\src\services.cpp
[Notify]
;file \plugins\Popup\src\skin.cpp
-[The skin you are trying to load is designed\r\nfor newer version of Popup Plus. And will not\r\ndisplay properly.\r\n\r\nPlease choose another skin.]
+[The skin you are trying to load is designed\r\nfor newer version of Popup plus. And will not\r\ndisplay properly.\r\n\r\nPlease choose another skin.]
;file \plugins\Popup\src\srmm_menu.cpp
[Auto]
[Favorite]
diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index 76de5546d8..ee0e19cffd 100644
--- a/langpacks/english/Plugins/SendSS.txt
+++ b/langpacks/english/Plugins/SendSS.txt
@@ -112,7 +112,7 @@
[SendSS HTTP connections]
[SendSS]
[Screenshots]
-[Image services (AdvaImg) not found.\nSendSS disabled.]
+[Image services (AdvaImg plugin) not found.\nSendSS disabled.]
[Buttons]
[Could not register Miranda service.]
[Take a screenshot]
diff --git a/langpacks/english/Plugins/Tipper.txt b/langpacks/english/Plugins/Tipper.txt
index 87c5d2fd7a..f084e02c85 100644
--- a/langpacks/english/Plugins/Tipper.txt
+++ b/langpacks/english/Plugins/Tipper.txt
@@ -5,7 +5,7 @@
; Version: 2.1.0.7
; Authors: Scott Ellis, yaho
;============================================================
-[Tool Tip notification windows.]
+[Tooltip notification windows.]
;file \plugins\TipperYM\res\resource.rc
[Layout]
[Text indent:]
diff --git a/langpacks/english/Plugins/TooltipNotify.txt b/langpacks/english/Plugins/TooltipNotify.txt
index 76635e0490..8642436fe7 100644
--- a/langpacks/english/Plugins/TooltipNotify.txt
+++ b/langpacks/english/Plugins/TooltipNotify.txt
@@ -40,10 +40,7 @@
;file \plugins\TooltipNotify\src\TooltipNotify.cpp
[Tooltip Notify]
[Other status]
-[Tooltip Notify: Online]
-[Tooltip Notify: Offline]
-[Tooltip Notify: Other]
-[Tooltip Notify: Typing]
+[Other]
[Popups]
[** New contacts **]
[** Unknown contacts **]
diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index 7dd3998585..68e0bc35dc 100644
--- a/langpacks/english/Plugins/Tox.txt
+++ b/langpacks/english/Plugins/Tox.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Tox.dll
; Plugin: Tox protocol
-; Version: 0.11.1.16
+; Version: 0.11.1.18
; Authors: Miranda NG Team
;============================================================
[Tox protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt
index d61f428c70..2bce29e83f 100644
--- a/langpacks/english/Plugins/Yahoo.txt
+++ b/langpacks/english/Plugins/Yahoo.txt
@@ -90,8 +90,8 @@
[New E-mail available in Inbox]
[%s plugin connections]
[ID]
-[Please enter your Yahoo ID in Options/Network/Yahoo]
-[Please enter your Yahoo password in Options/Network/Yahoo]
+[Please enter your Yahoo ID in Options -> Network -> Yahoo]
+[Please enter your Yahoo password in Options -> Network -> Yahoo]
[Yahoo Login Error]
;file \protocols\Yahoo\src\services.cpp
[You need to be connected to set the custom message]
diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt
index 3b28c58e3d..540b25261f 100644
--- a/langpacks/russian/=CORE=.txt
+++ b/langpacks/russian/=CORE=.txt
@@ -2329,10 +2329,10 @@ xСтатус
Ошибка записи уникального ID контакта в метаконтакт
[Could not write nickname of contact to metacontact]
Не могу записать ник контакта в метаконтакт
-[&Move to group]
-&Группа
[<Root group>]
<Корневая группа>
+[&Move to group]
+&Группа
[Standard Netlib log]
Стандартный журнал Netlib
[No times]
diff --git a/langpacks/russian/Plugins/AIM.txt b/langpacks/russian/Plugins/AIM.txt
index 15c0f32729..c7338cb242 100644
--- a/langpacks/russian/Plugins/AIM.txt
+++ b/langpacks/russian/Plugins/AIM.txt
@@ -203,8 +203,6 @@ AIM Установить Instant Idle
Протокол %s
[%s server connection]
%s подключение к серверу
-[%s Client-to-client connection]
-%s подключения между пользователями
[[Auto-Response]:]
(Автоответ):
[No information has been provided by the server.]
diff --git a/langpacks/russian/Plugins/AVS.txt b/langpacks/russian/Plugins/AVS.txt
index 28a6fca60c..986ae7671f 100644
--- a/langpacks/russian/Plugins/AVS.txt
+++ b/langpacks/russian/Plugins/AVS.txt
@@ -13,8 +13,6 @@
Установить стандартное
[Delete default picture]
Удалить стандартное
-[CAUTION: These pictures are NOT your own avatars.\nTo set your own avatar go to Main menu -> View/change my details -> Avatars.]
-ВНИМАНИЕ! Эти изображения НЕ ВАШИ аватары. Вы можете установить свой аватар в разделе "Главное меню -> Личные данные -> Аватар".
[Try to draw avatar background transparent (for images without transparency)]
Выводить фон аватара прозрачным (для аватаров без прозрачности)
[Number of points to define background:]
diff --git a/langpacks/russian/Plugins/Clist_modern.txt b/langpacks/russian/Plugins/Clist_modern.txt
index d388e8a09e..1b8f0a092d 100644
--- a/langpacks/russian/Plugins/Clist_modern.txt
+++ b/langpacks/russian/Plugins/Clist_modern.txt
@@ -617,14 +617,14 @@ Ctrl+Левый клик вкл. фильтр по протоколу, клик
&Вверх
[&Down]
В&низ
+[Lock frame]
+Закрепить фрейм
[Show all frames]
Показать все фреймы
[Show all title bars]
Показывать названия
[Hide all title bars]
Скрыть названия
-[Lock frame]
-Закрепить фрейм
[&Hide/show]
С&крыть/Показать
[&Find/add contacts...]
diff --git a/langpacks/russian/Plugins/Clist_nicer.txt b/langpacks/russian/Plugins/Clist_nicer.txt
index 87dba784fd..5990b6328c 100644
--- a/langpacks/russian/Plugins/Clist_nicer.txt
+++ b/langpacks/russian/Plugins/Clist_nicer.txt
@@ -17,7 +17,7 @@
Выход из Miranda
[Although the exception was caught and you may continue working with Miranda, you should restart the program as soon as possible. The exception may have damaged internal data structures and can have a serious impact on stability.]
Несмотря на то, что программа продолжает работать, её нужно перезапустить как можно скорее. Исключение может повредить внутренние структуры данных и вызвать серьёзные проблемы.
-[About CList nicer]
+[About Clist nicer]
О плагине CList nicer
[Copyright © 2004-2010 by the Miranda IM project, 2012-2015 by the Miranda NG project. More detailed copyright information can be found in the included README file.]
Авторские права © 2004-2010 проект Miranda IM, 2012-2015 проект Miranda NG. Более подробная информация об авторских правах содержится в файле README.
@@ -679,14 +679,6 @@
&Вверх
[&Down]
В&низ
-[Frames]
-Фреймы
-[Show all frames]
-Показать все фреймы
-[Show all title bars]
-Показывать названия
-[Hide all title bars]
-Скрыть названия
[Lock frame]
Закрепить фрейм
[Visible]
@@ -697,6 +689,14 @@
Применять скин к фрейму
[Floating]
Плавающее
+[Frames]
+Фреймы
+[Show all frames]
+Показать все фреймы
+[Show all title bars]
+Показывать названия
+[Hide all title bars]
+Скрыть названия
[Title bar]
Заголовок
[Tool Window]
diff --git a/langpacks/russian/Plugins/Contacts.txt b/langpacks/russian/Plugins/Contacts.txt
index 96c0708dad..312ba02e31 100644
--- a/langpacks/russian/Plugins/Contacts.txt
+++ b/langpacks/russian/Plugins/Contacts.txt
@@ -51,6 +51,8 @@
Приняты контакты от
[Contacts]
Контакты
+[Events]
+События
[Incoming Contacts]
Входящие контакты
[Outgoing Contacts]
diff --git a/langpacks/russian/Plugins/Facebook.txt b/langpacks/russian/Plugins/Facebook.txt
index 7740e4c6ee..05389d754e 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.11.4
+; Version: 0.2.11.6
; Authors: Michal Zelinka, Robert Pösel
;============================================================
[Facebook protocol support for Miranda NG.]
@@ -77,8 +77,6 @@
Публиковать статусы Miranda на стену
[Turn off chat on Facebook when going to offline in Miranda]
Отключать чат на сайте при уходе в оффлайн в Miranda NG
-[Map unsupported statuses to Invisible (instead of Online)]
-Неподдерживаемые статусы, как Невидимый (вместо 'В сети')
[Allow posting statuses to my pages (may slow down login)]
Разрешить публиковать статусы на своих страницах (замедляет вход)
[Bots challenge test]
diff --git a/langpacks/russian/Plugins/FileAsMessage.txt b/langpacks/russian/Plugins/FileAsMessage.txt
index e3a959df9a..7a3d0c81a8 100644
--- a/langpacks/russian/Plugins/FileAsMessage.txt
+++ b/langpacks/russian/Plugins/FileAsMessage.txt
@@ -35,8 +35,6 @@
Принято
[Use only alphanumeric encoding on transfer]
Только буквенно-цифровая кодировка для передачи
-[Extra options: Events > File Transfers, "Receiving files" group]
-Доп. настройки: События > Передача файлов, "Приём файлов"
[File already exists. Overwrite?]
Файл уже есть. Перезаписать?
[Couldn't open a file]
diff --git a/langpacks/russian/Plugins/Msg_Export.txt b/langpacks/russian/Plugins/Msg_Export.txt
index a32731d1ab..10c2774542 100644
--- a/langpacks/russian/Plugins/Msg_Export.txt
+++ b/langpacks/russian/Plugins/Msg_Export.txt
@@ -73,8 +73,6 @@ UTF8 в новых файлах
Копировать
[Internal error! (lExtraRead >= 0)]
Внутренняя ошибка! (lExtraRead >= 0)
-[Failed to load Rich Edit ( Msftedit.DLL )]
-Не удалось загрузить Rich Edit ( Msftedit.DLL )
[Search string was not found!]
Строка не найдена!
[Save as RTF]
diff --git a/langpacks/russian/Plugins/Popup.txt b/langpacks/russian/Plugins/Popup.txt
index fbce297a62..bb090236a7 100644
--- a/langpacks/russian/Plugins/Popup.txt
+++ b/langpacks/russian/Plugins/Popup.txt
@@ -7,10 +7,6 @@
;============================================================
[Provides popup notification services for different plugins.]
Предоставляет сервис всплывающих окон для различных плагинов.
-[Content && Style]
-Стиль окон
-[Go to Customize > Fonts && Colors for fonts and colors options]
-Настройки шрифтов и цвета: Тонкая настройка>Шрифты и цвета
[Miscellaneous]
Прочее
[Effects]
@@ -149,8 +145,6 @@ History++ для истории окон
Отключить, когда глобальный статус...
[Disable when relevant protocol's status is...]
Отключить, когда статус соотв. протокола...
-[Colors can be configured in\r\nCustomize > Fonts and colors]
-Цвета настраиваются в\r\nТонкая настройка > Шрифты и цвета
[More...]
Ещё...
[Disable if message window is open]
@@ -307,7 +301,7 @@ History++ для истории окон
Включить всплывающие окна
[Disable Popups]
Отключить всплывающие окна
-[Popup Plus]
+[Popup plus]
Всплывающие окна
[Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
Ошибка: Не удалось зарегистрировать класс Popup Window.\r\nПлагин не будет работать.
@@ -361,7 +355,7 @@ History++ для истории окон
Значение меньшее %d или большее %d не допускается.
['Reorder popups' option is currently disabled.\r\nThis may cause misaligned popups when used with\r\navatars and text replacement (mainly NewXstatusNotify).\r\n\r\nDo you want to enable popup reordering now?\r\n]
Настройка 'Упорядочивать (сдвигать) окна' отключена.\r\nЭто может привести к перекосу при использовании с\r\nаватарами и заменой текста (с плагином NewXstatusNotify).\r\n\r\nВключить упорядочивание (сдвигание) окон?\r\n
-[Popup Plus Warning]
+[Popup plus warning]
Предупреждение Popup Plus
[Failed to register %s class.]
Не удалось зарегистрировать класс %s.
@@ -391,7 +385,7 @@ History++ для истории окон
Не удалось зарегистрировать класс custom edit box window.\r\n\r\ncbSize: %i\r\nstyle: %p\r\nlpfnWndProc: %i\r\ncbClsExtra: %i\r\ncbWndExtra: %i\r\nhInstance: %i\r\nhIcon: %i\r\nhCursor: %i\r\nhbrBackground: %i\r\nlpszMenuName: %s\r\nlpszClassName: %s\r\nhIconSm: %i\r\n
[Notify]
Уведомление
-[The skin you are trying to load is designed\r\nfor newer version of Popup Plus. And will not\r\ndisplay properly.\r\n\r\nPlease choose another skin.]
+[The skin you are trying to load is designed\r\nfor newer version of Popup plus. And will not\r\ndisplay properly.\r\n\r\nPlease choose another skin.]
Скин, который вы пытаетесь загрузить, разработан\r\nдля более новой версии плагина Popup Plus и не будет\r\nправильно отображаться.\r\n\r\nПожалуйста, выберите другой скин.
[Auto]
Авто
diff --git a/langpacks/russian/Plugins/SendSS.txt b/langpacks/russian/Plugins/SendSS.txt
index 3d6ea18428..90d7d353c0 100644
--- a/langpacks/russian/Plugins/SendSS.txt
+++ b/langpacks/russian/Plugins/SendSS.txt
@@ -151,8 +151,6 @@ HTTP подключение SendSS
Отправить скриншот
[Screenshots]
Снимки экрана
-[Image services (AdvaImg) not found.\nSendSS disabled.]
-Не найдена служба изображений (плагин AdvaImg).\nПлагин SendSS будет отключён.
[Buttons]
Кнопки
[Take a screenshot]
diff --git a/langpacks/russian/Plugins/Tipper.txt b/langpacks/russian/Plugins/Tipper.txt
index e01d03fef8..ca630e2c25 100644
--- a/langpacks/russian/Plugins/Tipper.txt
+++ b/langpacks/russian/Plugins/Tipper.txt
@@ -5,8 +5,6 @@
; Version: 2.1.0.7
; Authors: Scott Ellis, yaho
;============================================================
-[Tool Tip notification windows.]
-Всплывающие подсказки для списка контактов.
[Layout]
Размещение
[Text indent:]
diff --git a/langpacks/russian/Plugins/TooltipNotify.txt b/langpacks/russian/Plugins/TooltipNotify.txt
index 6d07acb74f..48a3e6017f 100644
--- a/langpacks/russian/Plugins/TooltipNotify.txt
+++ b/langpacks/russian/Plugins/TooltipNotify.txt
@@ -71,14 +71,8 @@
Всплывающие уведомления
[Other status]
Другой статус
-[Tooltip Notify: Online]
-Уведомления: В сети
-[Tooltip Notify: Offline]
-Уведомления: Не в сети
-[Tooltip Notify: Other]
-Уведомления: Другое
-[Tooltip Notify: Typing]
-Уведомления: Печатает
+[Other]
+Другое
[Popups]
Всплывающие окна
[** New contacts **]
diff --git a/langpacks/russian/Plugins/Tox.txt b/langpacks/russian/Plugins/Tox.txt
index 5a85668965..6607527f3b 100644
--- a/langpacks/russian/Plugins/Tox.txt
+++ b/langpacks/russian/Plugins/Tox.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Tox.dll
; Plugin: Tox protocol
-; Version: 0.11.1.16
+; Version: 0.11.1.18
; Authors: Miranda NG Team
;============================================================
[Tox protocol support for Miranda NG.]
diff --git a/langpacks/russian/Plugins/Yahoo.txt b/langpacks/russian/Plugins/Yahoo.txt
index 311a71b06b..2d86519f20 100644
--- a/langpacks/russian/Plugins/Yahoo.txt
+++ b/langpacks/russian/Plugins/Yahoo.txt
@@ -153,10 +153,6 @@ Yahoo подключения по HTTP
Новая почта в папке "Входящие"
[%s plugin connections]
%s подключение к серверу
-[Please enter your Yahoo ID in Options/Network/Yahoo]
-Введите ваш Yahoo ID - Настройки/Сеть/Yahoo
-[Please enter your Yahoo password in Options/Network/Yahoo]
-Введите ваш пароль Yahoo в Настройки/Сеть/Yahoo
[Yahoo Login Error]
Ошибка подключения Yahoo
[You need to be connected to set the custom message]
diff --git a/langpacks/russian/Untranslated/AIM.txt b/langpacks/russian/Untranslated/AIM.txt
index 3d8ab092d3..9579de51c0 100644
--- a/langpacks/russian/Untranslated/AIM.txt
+++ b/langpacks/russian/Untranslated/AIM.txt
@@ -37,6 +37,7 @@
[Over Limit.]
[Email Host Fail.]
[Open mail account?]
+[%s client-to-client connections]
[Contact tried to open an audio/video conference (not currently supported)]
[Item you want to delete not found in list.]
[Failed to add buddy to list: Item already exist.]
diff --git a/langpacks/russian/Untranslated/AVS.txt b/langpacks/russian/Untranslated/AVS.txt
new file mode 100644
index 0000000000..1230b71fa8
--- /dev/null
+++ b/langpacks/russian/Untranslated/AVS.txt
@@ -0,0 +1 @@
+[CAUTION: These pictures are NOT your own avatars.\nTo set your own avatar go to Main menu -> View/change my details -> Avatar.]
diff --git a/langpacks/russian/Untranslated/Facebook.txt b/langpacks/russian/Untranslated/Facebook.txt
index 4d2147c4cb..3b94dbbf4a 100644
--- a/langpacks/russian/Untranslated/Facebook.txt
+++ b/langpacks/russian/Untranslated/Facebook.txt
@@ -1 +1,2 @@
[URL:]
+[Map unsupported statuses to Invisible (instead of Away)]
diff --git a/langpacks/russian/Untranslated/FileAsMessage.txt b/langpacks/russian/Untranslated/FileAsMessage.txt
new file mode 100644
index 0000000000..0d9f3edf5e
--- /dev/null
+++ b/langpacks/russian/Untranslated/FileAsMessage.txt
@@ -0,0 +1 @@
+[Extra options: Events -> File Transfers, "Receiving files" group]
diff --git a/langpacks/russian/Untranslated/Msg_Export.txt b/langpacks/russian/Untranslated/Msg_Export.txt
index 1a66ba02a8..3b8951136b 100644
--- a/langpacks/russian/Untranslated/Msg_Export.txt
+++ b/langpacks/russian/Untranslated/Msg_Export.txt
@@ -1,7 +1,8 @@
-[Failed to write to the RichEdit the buffer was to small.]
+[Failed to write to the Rich Edit the buffer was to small.]
[Error: Optimal buffer size decreased to a too low size!]
[Failed to execute external file view]
-[Failed to get handle to RichEdit!]
+[Failed to load Rich Edit (Msftedit.dll)]
+[Failed to get handle to Rich Edit!]
[Failed to open file\r\n%s\r\n\r\nContact handle is invalid]
[Failed to open file\r\n%s\r\n\r\nMiranda database contains %d events]
[With scroll to bottom %d\n]
diff --git a/langpacks/russian/Untranslated/Popup.txt b/langpacks/russian/Untranslated/Popup.txt
new file mode 100644
index 0000000000..5e81d6c978
--- /dev/null
+++ b/langpacks/russian/Untranslated/Popup.txt
@@ -0,0 +1,3 @@
+[Content and Style]
+[Go to Customize -> Fonts and Colors for fonts and colors options]
+[Colors can be configured in\r\nCustomize -> Fonts and colors]
diff --git a/langpacks/russian/Untranslated/SendSS.txt b/langpacks/russian/Untranslated/SendSS.txt
index 7d07c3c77f..5b7778e8c5 100644
--- a/langpacks/russian/Untranslated/SendSS.txt
+++ b/langpacks/russian/Untranslated/SendSS.txt
@@ -19,5 +19,6 @@
[Edit on]
[BBC]
[BBC link]
+[Image services (AdvaImg plugin) not found.\nSendSS disabled.]
[Could not register Miranda service.]
[Fill description textbox.]
diff --git a/langpacks/russian/Untranslated/Tipper.txt b/langpacks/russian/Untranslated/Tipper.txt
new file mode 100644
index 0000000000..8fa8a1eb37
--- /dev/null
+++ b/langpacks/russian/Untranslated/Tipper.txt
@@ -0,0 +1 @@
+[Tooltip notification windows.]
diff --git a/langpacks/russian/Untranslated/Yahoo.txt b/langpacks/russian/Untranslated/Yahoo.txt
index 37c6417cf9..35bc47a8f9 100644
--- a/langpacks/russian/Untranslated/Yahoo.txt
+++ b/langpacks/russian/Untranslated/Yahoo.txt
@@ -1,3 +1,5 @@
[Yahoo]
[ID:]
[ID]
+[Please enter your Yahoo ID in Options -> Network -> Yahoo]
+[Please enter your Yahoo password in Options -> Network -> Yahoo]