124 files changed, 315 insertions, 343 deletions
diff --git a/langpacks/belarusian/=CORE=.txt b/langpacks/belarusian/=CORE=.txt
index b29109fb39..42df679d18 100644
--- a/langpacks/belarusian/=CORE=.txt
+++ b/langpacks/belarusian/=CORE=.txt
@@ -2373,10 +2373,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/belarusian/Plugins/AIM.txt b/langpacks/belarusian/Plugins/AIM.txt
index 675fa81fb9..924ecf1b53 100644
--- a/langpacks/belarusian/Plugins/AIM.txt
+++ b/langpacks/belarusian/Plugins/AIM.txt
@@ -281,8 +281,8 @@ AIM Усталяваць Instant Idle
 Адчыніць скрыню конта?
 [%s server connection]
 Далучэнне да сервера %s
-[%s Client-to-client connection]
-%s  злучэнне кліент-кліент
+[%s client-to-client connections]
+Злучэнні паміж кліентамі %s
 [[Auto-Response]:]
 (Аўтаадказ):
 [Contact tried to open an audio/video conference (not currently supported)]
diff --git a/langpacks/belarusian/Plugins/AVS.txt b/langpacks/belarusian/Plugins/AVS.txt
index f08670a19d..31251b9b4e 100644
--- a/langpacks/belarusian/Plugins/AVS.txt
+++ b/langpacks/belarusian/Plugins/AVS.txt
@@ -13,7 +13,7 @@
 Усталяваць стандартнае
 [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)]
 Выводзіць фон аватара празрыстым (для аватараў без празрыстасці)
diff --git a/langpacks/belarusian/Plugins/Clist_modern.txt b/langpacks/belarusian/Plugins/Clist_modern.txt
index c9e59aba18..6f57f9cdfb 100644
--- a/langpacks/belarusian/Plugins/Clist_modern.txt
+++ b/langpacks/belarusian/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/belarusian/Plugins/Clist_nicer.txt b/langpacks/belarusian/Plugins/Clist_nicer.txt
index b0678c933c..da8d38d71b 100644
--- a/langpacks/belarusian/Plugins/Clist_nicer.txt
+++ b/langpacks/belarusian/Plugins/Clist_nicer.txt
@@ -17,8 +17,8 @@
 Выйсці з Міранды
 [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]
-Пра CList nicer
+[About Clist nicer]
+Пра Clist nicer
 [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.]
@@ -423,8 +423,8 @@ Clist nicer
 Іншае
 [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]
@@ -685,14 +685,6 @@ Clist nicer
 &Уверх
 [&Down]
 У&ніз
-[Frames]
-Фрэймы
-[Show all frames]
-Паказаць усе фрэймы
-[Show all title bars]
-Паказваць назвы
-[Hide all title bars]
-Схаваць назвы
 [Lock frame]
 Замацаваць фрэйм
 [Visible]
@@ -703,6 +695,14 @@ Clist nicer
 Ужываць скін да фрэйма
 [Floating]
 Плывучае
+[Frames]
+Фрэймы
+[Show all frames]
+Паказаць усе фрэймы
+[Show all title bars]
+Паказваць назвы
+[Hide all title bars]
+Схаваць назвы
 [Title bar]
 Загаловак
 [Tool Window]
diff --git a/langpacks/belarusian/Plugins/Contacts.txt b/langpacks/belarusian/Plugins/Contacts.txt
index b7b67fa55c..7e6305bb73 100644
--- a/langpacks/belarusian/Plugins/Contacts.txt
+++ b/langpacks/belarusian/Plugins/Contacts.txt
@@ -51,6 +51,8 @@
 Атрыманы кантакты ад
 [Contacts]
 Кантакты
+[Events]
+Падзеі
 [Incoming Contacts]
 Уваходныя кантакты
 [Outgoing Contacts]
diff --git a/langpacks/belarusian/Plugins/Facebook.txt b/langpacks/belarusian/Plugins/Facebook.txt
index 9b2d4249a9..c1fac1f76b 100644
--- a/langpacks/belarusian/Plugins/Facebook.txt
+++ b/langpacks/belarusian/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.]
@@ -79,7 +79,7 @@ URL:
 Публікаваць статусы Miranda на сцяну
 [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)]
 Дазволіць публікаваць статусы на сваіх старонках (замаруджвае уваход)
diff --git a/langpacks/belarusian/Plugins/FileAsMessage.txt b/langpacks/belarusian/Plugins/FileAsMessage.txt
index 73da55e9f5..b5462398bd 100644
--- a/langpacks/belarusian/Plugins/FileAsMessage.txt
+++ b/langpacks/belarusian/Plugins/FileAsMessage.txt
@@ -35,8 +35,8 @@
 прынята
 [Use only alphanumeric encoding on transfer]
 Толькі літарна-цыфравая кадоўка для перадачы
-[Extra options: Events > File Transfers, "Receiving files" group]
-Дад. налады: Падзеі> Перадача файлаў, "Прыём файлаў"
+[Extra options: Events -> File Transfers, "Receiving files" group]
+Дад. налады: "Падзеі -> Перадача файлаў", "Прыём файлаў"
 [File already exists. Overwrite?]
 Файл ужо існуе. Перазапісаць?
 [Couldn't open a file]
diff --git a/langpacks/belarusian/Plugins/Msg_Export.txt b/langpacks/belarusian/Plugins/Msg_Export.txt
index 4760422216..d56e81288d 100644
--- a/langpacks/belarusian/Plugins/Msg_Export.txt
+++ b/langpacks/belarusian/Plugins/Msg_Export.txt
@@ -71,17 +71,17 @@ UTF8 у новых файлах
 Імя файла па змаўчанні
 [Copy]
 Капіяваць
-[Failed to write to the RichEdit the buffer was to small.]
-Не атрымалася запісаць у RichEdit.
+[Failed to write to the Rich Edit the buffer was to small.]
+Не атрымалася запісаць у Rich Edit.
 [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 load Rich Edit (Msftedit.dll)]
 
-[Failed to get handle to RichEdit!]
+[Failed to get handle to Rich Edit!]
 
 [Failed to open file\r\n%s\r\n\r\nContact handle is invalid]
 
diff --git a/langpacks/belarusian/Plugins/Popup.txt b/langpacks/belarusian/Plugins/Popup.txt
index 4987b83441..43fca12d09 100644
--- a/langpacks/belarusian/Plugins/Popup.txt
+++ b/langpacks/belarusian/Plugins/Popup.txt
@@ -7,10 +7,10 @@
 ;============================================================
 [Provides popup notification services for different plugins.]
 Падае сэрвіс усплывальных вокнаў для розных плагінаў.
-[Content && Style]
+[Content and Style]
 Стыль вокнаў
-[Go to Customize > Fonts && Colors for fonts and colors options]
-Налады шрыфтоў і колеры: Тонкая налада>Шрыфты і колеры
+[Go to Customize -> Fonts and Colors for fonts and colors options]
+Налады шрыфтоў і колеры: "Тонкая налада -> Шрыфты і колеры"
 [Miscellaneous]
 Іншае
 [Effects]
@@ -149,8 +149,8 @@ History++ для гісторыі вокнаў
 Адключыць, калі глабальны статус...
 [Disable when relevant protocol's status is...]
 Адключыць, калі статус адпавядае пратаколу...
-[Colors can be configured in\r\nCustomize > Fonts and colors]
-Настроіць колеры ў\r\nТонкая налада > Шрыфты і колеры
+[Colors can be configured in\r\nCustomize -> Fonts and colors]
+Настроіць колеры ў\r\n"Тонкая налада -> Шрыфты і колеры"
 [More...]
 Яшчэ...
 [Disable if message window is open]
@@ -307,7 +307,7 @@ History++ для гісторыі вокнаў
 Уключыць Вокны
 [Disable Popups]
 Адключыць Вокны
-[Popup Plus]
+[Popup plus]
 Вокны
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 
@@ -361,8 +361,8 @@ 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]
 
-[Popup Plus Warning]
-Заўвага Popup Plus
+[Popup plus warning]
+Заўвага Popup plus
 [Failed to register %s class.]
 
 [Skin preview]
@@ -391,7 +391,7 @@ History++ для гісторыі вокнаў
 
 [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.]
 
 [Auto]
 Аўта
diff --git a/langpacks/belarusian/Plugins/SendSS.txt b/langpacks/belarusian/Plugins/SendSS.txt
index c83ab750f6..0d1826795d 100644
--- a/langpacks/belarusian/Plugins/SendSS.txt
+++ b/langpacks/belarusian/Plugins/SendSS.txt
@@ -193,7 +193,7 @@ HTTP далучэнне SendSS
 Адправіць скрыншот
 [Screenshots]
 Здымкі экрана
-[Image services (AdvaImg) not found.\nSendSS disabled.]
+[Image services (AdvaImg plugin) not found.\nSendSS disabled.]
 
 [Buttons]
 Кнопкі
diff --git a/langpacks/belarusian/Plugins/Tipper.txt b/langpacks/belarusian/Plugins/Tipper.txt
index 8c983a0a5c..f99c08d00b 100644
--- a/langpacks/belarusian/Plugins/Tipper.txt
+++ b/langpacks/belarusian/Plugins/Tipper.txt
@@ -5,7 +5,7 @@
 ;  Version: 2.1.0.7
 ;  Authors: Scott Ellis, yaho
 ;============================================================
-[Tool Tip notification windows.]
+[Tooltip notification windows.]
 Усплывальныя падказкi для іншых плагiнаў.
 [Layout]
 Размяшчэнне
diff --git a/langpacks/belarusian/Plugins/TooltipNotify.txt b/langpacks/belarusian/Plugins/TooltipNotify.txt
index f576b2aef4..0374395f31 100644
--- a/langpacks/belarusian/Plugins/TooltipNotify.txt
+++ b/langpacks/belarusian/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/belarusian/Plugins/Tox.txt b/langpacks/belarusian/Plugins/Tox.txt
index 7b6d0713d5..16040ae338 100644
--- a/langpacks/belarusian/Plugins/Tox.txt
+++ b/langpacks/belarusian/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/belarusian/Plugins/Yahoo.txt b/langpacks/belarusian/Plugins/Yahoo.txt
index 4524c1b51e..2bc5c9ca17 100644
--- a/langpacks/belarusian/Plugins/Yahoo.txt
+++ b/langpacks/belarusian/Plugins/Yahoo.txt
@@ -159,10 +159,10 @@ Yahoo Ігнор
 %s злучэнне з серверам
 [ID]
 
-[Please enter your Yahoo ID in Options/Network/Yahoo]
-Увядзіце ваш Yahoo ID - Налады/Сеціва/Yahoo
-[Please enter your Yahoo password in Options/Network/Yahoo]
-Увядзіце ваш Yahoo пароль - Налады/Сеціва/Yahoo
+[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/bulgarian/=CORE=.txt b/langpacks/bulgarian/=CORE=.txt
index 9bcf3cda52..6fdb735f07 100644
--- a/langpacks/bulgarian/=CORE=.txt
+++ b/langpacks/bulgarian/=CORE=.txt
@@ -2273,10 +2273,10 @@ Win +\s
 Изберете метакнтакт
 [Sender]
 Изпращач
-[&Move to group]
-Преместване в друга група
 [<Root group>]
 <Главна група>
+[&Move to group]
+Преместване в друга група
 [No times]
 Без час
 [Standard hh:mm:ss times]
diff --git a/langpacks/bulgarian/Plugins/AIM.txt b/langpacks/bulgarian/Plugins/AIM.txt
index 4ef326f4bf..47fb671ae5 100644
--- a/langpacks/bulgarian/Plugins/AIM.txt
+++ b/langpacks/bulgarian/Plugins/AIM.txt
@@ -209,8 +209,8 @@ AIM настройки
 Отваряне на пощенския акаунт?
 [%s server connection]
 %s връзка със сървъра
-[%s Client-to-client connection]
-%s връзки клиент-с-клиент
+[%s client-to-client connections]
+%s връзки client-to-client
 [[Auto-Response]:]
 (Автоотговор):
 [No information has been provided by the server.]
diff --git a/langpacks/bulgarian/Plugins/AVS.txt b/langpacks/bulgarian/Plugins/AVS.txt
index 959878eda4..f4a1c1c653 100644
--- a/langpacks/bulgarian/Plugins/AVS.txt
+++ b/langpacks/bulgarian/Plugins/AVS.txt
@@ -13,7 +13,7 @@
 Задаване на станд. картинка
 [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.]
 ВНИМАНИЕ: Това НЕ са вашите аватари. За да зададете собствен аватар отидете\nв "Главно меню > Преглед/Промяна на личните данни > Аватар".
 [Try to draw avatar background transparent (for images without transparency)]
 Прозрачен фон (за непрозрачни изображения), ако е възможно
diff --git a/langpacks/bulgarian/Plugins/Clist_modern.txt b/langpacks/bulgarian/Plugins/Clist_modern.txt
index 2f649063fc..e256c49b12 100644
--- a/langpacks/bulgarian/Plugins/Clist_modern.txt
+++ b/langpacks/bulgarian/Plugins/Clist_modern.txt
@@ -577,14 +577,14 @@ ms между две мигания
 Нагоре
 [&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/bulgarian/Plugins/Clist_nicer.txt b/langpacks/bulgarian/Plugins/Clist_nicer.txt
index e4420ce1c2..60e61875ad 100644
--- a/langpacks/bulgarian/Plugins/Clist_nicer.txt
+++ b/langpacks/bulgarian/Plugins/Clist_nicer.txt
@@ -17,8 +17,8 @@ CList nicer изключение
 Изход от 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.]
 Въпреки проблемът ви можете да продължите работата си с Miranda, но е наложително да рестарти-\nрате програмата възможно най-скоро. Има вероятност грешката да е повредила вътрешната струк-\nтура на данните, което може да се отрази сериозно на стабилността.
-[About CList nicer]
-Относно CList nicer
+[About Clist nicer]
+Относно Clist nicer
 [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.]
@@ -387,8 +387,8 @@ URL събития
 Друго
 [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]
@@ -643,14 +643,6 @@ URL събития
 Нагоре
 [&Down]
 Надолу
-[Frames]
-Рамки
-[Show all frames]
-Показване на всички рамки
-[Show all title bars]
-Показване на всички заглавни ленти
-[Hide all title bars]
-Скриване на всички заглавни ленти
 [Lock frame]
 Заключване на рамката
 [Visible]
@@ -661,6 +653,14 @@ URL събития
 Облицована рамка
 [Floating]
 Плаващо
+[Frames]
+Рамки
+[Show all frames]
+Показване на всички рамки
+[Show all title bars]
+Показване на всички заглавни ленти
+[Hide all title bars]
+Скриване на всички заглавни ленти
 [Title bar]
 Заглавна лента
 [Thin border]
diff --git a/langpacks/bulgarian/Plugins/Contacts.txt b/langpacks/bulgarian/Plugins/Contacts.txt
index bfcd5aa3b2..f6882a244f 100644
--- a/langpacks/bulgarian/Plugins/Contacts.txt
+++ b/langpacks/bulgarian/Plugins/Contacts.txt
@@ -39,6 +39,8 @@
 Изпращане на съобщение
 [Contacts]
 Контакти
+[Events]
+Събития
 [Incoming Contacts]
 Входящи контакти
 [Outgoing Contacts]
diff --git a/langpacks/bulgarian/Plugins/Facebook.txt b/langpacks/bulgarian/Plugins/Facebook.txt
index 4b5c45b486..4c71e281d6 100644
--- a/langpacks/bulgarian/Plugins/Facebook.txt
+++ b/langpacks/bulgarian/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.]
diff --git a/langpacks/bulgarian/Plugins/Popup.txt b/langpacks/bulgarian/Plugins/Popup.txt
index f799562848..5d8311402b 100644
--- a/langpacks/bulgarian/Plugins/Popup.txt
+++ b/langpacks/bulgarian/Plugins/Popup.txt
@@ -7,10 +7,10 @@
 ;============================================================
 [Provides popup notification services for different plugins.]
 Услуга за уведомяване чрез popup за останалите приставки.
-[Content && Style]
+[Content and Style]
 Съдържание и стил
-[Go to Customize > Fonts && Colors for fonts and colors options]
-Персонализиране>Шрифтове за избор на шрифтове и цветове
+[Go to Customize -> Fonts and Colors for fonts and colors options]
+"Персонализиране > Шрифтове и цветове" за избор на шрифтове и цветове
 [Miscellaneous]
 Разни
 [Effects]
@@ -143,8 +143,8 @@ Popup действията са малките бутони под текста.
 Десен бутон:
 [Disable when global status is...]
 Изключване, когато общото състояние е...
-[Colors can be configured in\r\nCustomize > Fonts and colors]
-Цветовете се настройват от Персонализиране>\r\nШрифтове и цветове
+[Colors can be configured in\r\nCustomize -> Fonts and colors]
+Цветовете се настройват от\r\n"Персонализиране > Шрифтове и цветове"
 [More...]
 Още...
 [Disable if message window is open]
@@ -287,7 +287,7 @@ Popup група
 Включване на Popups
 [Disable Popups]
 Изключване на Popups
-[Popup Plus]
+[Popup plus]
 Popup Plus
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 Грешка: Неуспешно регистриране на Popup Window class.\r\nПриставката няма да може да работи.
@@ -339,7 +339,7 @@ Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn!
 Състояния на протоколите
 [You cannot specify a value lower than %d and higher than %d.]
 Не е възможно задаването на стойност по-малка от %d и по-голяма от %d.
-[Popup Plus Warning]
+[Popup plus warning]
 Popup Plus Предупреждение
 [Failed to register %s class.]
 Неуспешно регистриране на %s class.
@@ -357,7 +357,7 @@ Popup Plus Предупреждение
 Обновяване на списъка
 [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/bulgarian/Plugins/Tipper.txt b/langpacks/bulgarian/Plugins/Tipper.txt
index 806d2ef4b9..79313aad68 100644
--- a/langpacks/bulgarian/Plugins/Tipper.txt
+++ b/langpacks/bulgarian/Plugins/Tipper.txt
@@ -5,7 +5,7 @@
 ;  Version: 2.1.0.7
 ;  Authors: Scott Ellis, yaho
 ;============================================================
-[Tool Tip notification windows.]
+[Tooltip notification windows.]
 Осигурява малки подсказващи прозорци - подсказки които се появяват за кратко, за да известят потребителя за дадено събитие.
 [Layout]
 Изглед
diff --git a/langpacks/bulgarian/Plugins/TooltipNotify.txt b/langpacks/bulgarian/Plugins/TooltipNotify.txt
index 3fb220ec78..9c7b63e40d 100644
--- a/langpacks/bulgarian/Plugins/TooltipNotify.txt
+++ b/langpacks/bulgarian/Plugins/TooltipNotify.txt
@@ -33,6 +33,8 @@ ms
 Контакти
 [Idle]
 Бездействие
+[Other]
+Друго
 [Popups]
 Рopups
 [** New contacts **]
diff --git a/langpacks/bulgarian/Plugins/Tox.txt b/langpacks/bulgarian/Plugins/Tox.txt
index 871ea01d88..eb5ef94903 100644
--- a/langpacks/bulgarian/Plugins/Tox.txt
+++ b/langpacks/bulgarian/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/bulgarian/Plugins/Yahoo.txt b/langpacks/bulgarian/Plugins/Yahoo.txt
index f6c50aa2fc..d01f78bda2 100644
--- a/langpacks/bulgarian/Plugins/Yahoo.txt
+++ b/langpacks/bulgarian/Plugins/Yahoo.txt
@@ -155,10 +155,10 @@ Yahoo игнориране
 Връзки на приставката "%s"
 [ID]
 Идентификатор
-[Please enter your Yahoo ID in Options/Network/Yahoo]
-Въведете Yahoo ID в Настройки/Мрежа/Yahoo
-[Please enter your Yahoo password in Options/Network/Yahoo]
-Моля, въведете паролата си в Настройки>Мрежа>Yahoo
+[Please enter your Yahoo ID in Options -> Network -> Yahoo]
+Въведете Yahoo ID в "Настройки > Мрежа > Yahoo"
+[Please enter your Yahoo password in Options -> Network -> Yahoo]
+Въведете паролата си в "Настройки > Мрежа > Yahoo"
 [Yahoo Login Error]
 Yahoo грешка при вписването
 [You need to be connected to set the custom message]
diff --git a/langpacks/bulgarian/Untranslated/Facebook.txt b/langpacks/bulgarian/Untranslated/Facebook.txt
index e9b0214d7f..f48111a57b 100644
--- a/langpacks/bulgarian/Untranslated/Facebook.txt
+++ b/langpacks/bulgarian/Untranslated/Facebook.txt
@@ -9,7 +9,7 @@
 [Use logging notifications into special chatroom]
 [Statuses]
 [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)]
 [Receive messages from "inbox" folder only]
 [Keep messages as unread on server (don't send "seen" info)]
diff --git a/langpacks/bulgarian/Untranslated/FileAsMessage.txt b/langpacks/bulgarian/Untranslated/FileAsMessage.txt
index 7d71beb2ce..326d051e18 100644
--- a/langpacks/bulgarian/Untranslated/FileAsMessage.txt
+++ b/langpacks/bulgarian/Untranslated/FileAsMessage.txt
@@ -9,7 +9,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 already exists. Overwrite?]
 [Couldn't open a file]
 [Size: %d bytes]
diff --git a/langpacks/bulgarian/Untranslated/Msg_Export.txt b/langpacks/bulgarian/Untranslated/Msg_Export.txt
index 96705c8e8d..bdb19df06c 100644
--- a/langpacks/bulgarian/Untranslated/Msg_Export.txt
+++ b/langpacks/bulgarian/Untranslated/Msg_Export.txt
@@ -3,12 +3,12 @@
 [Use << and >>]
 [History file for %s (%s format %s)]
 [&External]
-[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/bulgarian/Untranslated/SendSS.txt b/langpacks/bulgarian/Untranslated/SendSS.txt
index 14740c640d..4e053c0bfd 100644
--- a/langpacks/bulgarian/Untranslated/SendSS.txt
+++ b/langpacks/bulgarian/Untranslated/SendSS.txt
@@ -62,7 +62,7 @@
 [SendSS HTTP connections]
 [SendSS]
 [Screenshots]
-[Image services (AdvaImg) not found.\nSendSS disabled.]
+[Image services (AdvaImg plugin) not found.\nSendSS disabled.]
 [Could not register Miranda service.]
 [Take a screenshot]
 [Send screenshot]
diff --git a/langpacks/bulgarian/Untranslated/TooltipNotify.txt b/langpacks/bulgarian/Untranslated/TooltipNotify.txt
index 47f97bb53a..0b35e13d66 100644
--- a/langpacks/bulgarian/Untranslated/TooltipNotify.txt
+++ b/langpacks/bulgarian/Untranslated/TooltipNotify.txt
@@ -17,9 +17,5 @@
 [Transparent tooltip]
 [Tooltip Notify]
 [Other status]
-[Tooltip Notify: Online]
-[Tooltip Notify: Offline]
-[Tooltip Notify: Other]
-[Tooltip Notify: Typing]
 [Not Idle]
 [is]
diff --git a/langpacks/croatian/=CORE=.txt b/langpacks/croatian/=CORE=.txt
index 81345baa19..57a9a0fa57 100644
--- a/langpacks/croatian/=CORE=.txt
+++ b/langpacks/croatian/=CORE=.txt
@@ -2461,10 +2461,10 @@ sve datoteke
 [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]
 
diff --git a/langpacks/croatian/Plugins/AIM.txt b/langpacks/croatian/Plugins/AIM.txt
index 348e741fac..321da5d785 100644
--- a/langpacks/croatian/Plugins/AIM.txt
+++ b/langpacks/croatian/Plugins/AIM.txt
@@ -288,7 +288,7 @@ Detalji o &Korisniku
 ;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]:]
diff --git a/langpacks/croatian/Plugins/AVS.txt b/langpacks/croatian/Plugins/AVS.txt
index 1e2aae4c1e..87b4da92b0 100644
--- a/langpacks/croatian/Plugins/AVS.txt
+++ b/langpacks/croatian/Plugins/AVS.txt
@@ -14,7 +14,7 @@
 
 [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)]
 
diff --git a/langpacks/croatian/Plugins/Clist_modern.txt b/langpacks/croatian/Plugins/Clist_modern.txt
index f6d2538192..b62604cf14 100644
--- a/langpacks/croatian/Plugins/Clist_modern.txt
+++ b/langpacks/croatian/Plugins/Clist_modern.txt
@@ -619,14 +619,14 @@ opcije
 
 [&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]
 
diff --git a/langpacks/croatian/Plugins/Clist_nicer.txt b/langpacks/croatian/Plugins/Clist_nicer.txt
index b9b719a117..a60d3c7458 100644
--- a/langpacks/croatian/Plugins/Clist_nicer.txt
+++ b/langpacks/croatian/Plugins/Clist_nicer.txt
@@ -18,7 +18,7 @@
 
 [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]
 
@@ -424,7 +424,7 @@ poruke
 drugo
 [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]
 
@@ -693,14 +693,6 @@ Upozorenje
 
 [&Down]
 
-[Frames]
-Okviri
-[Show all frames]
-
-[Show all title bars]
-
-[Hide all title bars]
-
 [Lock frame]
 
 [Visible]
@@ -711,6 +703,14 @@ prikaži naslovnu traku
 
 [Floating]
 
+[Frames]
+Okviri
+[Show all frames]
+
+[Show all title bars]
+
+[Hide all title bars]
+
 ;file \plugins\Clist_nicer\src\cluiopts.cpp
 [Title bar]
 
diff --git a/langpacks/croatian/Plugins/Contacts.txt b/langpacks/croatian/Plugins/Contacts.txt
index d38d98d032..21c5cb325f 100644
--- a/langpacks/croatian/Plugins/Contacts.txt
+++ b/langpacks/croatian/Plugins/Contacts.txt
@@ -53,6 +53,8 @@ Pojedinosti o korisniku
 
 [Contacts]
 
+[Events]
+
 [Incoming Contacts]
 
 [Outgoing Contacts]
diff --git a/langpacks/croatian/Plugins/Facebook.txt b/langpacks/croatian/Plugins/Facebook.txt
index 1d83442c82..15b777207d 100644
--- a/langpacks/croatian/Plugins/Facebook.txt
+++ b/langpacks/croatian/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.]
@@ -80,7 +80,7 @@ Pojedinosti o korisniku
 
 [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)]
 
diff --git a/langpacks/croatian/Plugins/FileAsMessage.txt b/langpacks/croatian/Plugins/FileAsMessage.txt
index 233d040f7d..e17a0d87f6 100644
--- a/langpacks/croatian/Plugins/FileAsMessage.txt
+++ b/langpacks/croatian/Plugins/FileAsMessage.txt
@@ -36,7 +36,7 @@
 
 [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?]
diff --git a/langpacks/croatian/Plugins/Msg_Export.txt b/langpacks/croatian/Plugins/Msg_Export.txt
index 0f7336ed0c..59755849c4 100644
--- a/langpacks/croatian/Plugins/Msg_Export.txt
+++ b/langpacks/croatian/Plugins/Msg_Export.txt
@@ -73,7 +73,7 @@ Detalji o &Korisniku
 [Copy]
 kopiraj
 ;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!]
 
@@ -81,9 +81,9 @@ kopiraj
 
 [Failed to execute external file view]
 
-[Failed to load Rich Edit ( Msftedit.DLL )]
+[Failed to load Rich Edit (Msftedit.dll)]
 
-[Failed to get handle to RichEdit!]
+[Failed to get handle to Rich Edit!]
 
 [Failed to open file\r\n%s\r\n\r\nContact handle is invalid]
 
diff --git a/langpacks/croatian/Plugins/Popup.txt b/langpacks/croatian/Plugins/Popup.txt
index 8fe4b5432c..07e0e45a70 100644
--- a/langpacks/croatian/Plugins/Popup.txt
+++ b/langpacks/croatian/Plugins/Popup.txt
@@ -8,9 +8,9 @@
 [Provides popup notification services for different plugins.]
 
 ;file \plugins\Popup\res\resource.rc
-[Content && Style]
+[Content and Style]
 
-[Go to Customize > Fonts && Colors for fonts and colors options]
+[Go to Customize -> Fonts and Colors for fonts and colors options]
 
 [Miscellaneous]
 
@@ -150,7 +150,7 @@ Povijest
 
 [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...]
 
@@ -315,7 +315,7 @@ akcije
 
 [Disable Popups]
 
-[Popup Plus]
+[Popup plus]
 
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 
@@ -372,7 +372,7 @@ akcije
 
 ['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.]
@@ -407,7 +407,7 @@ akcije
 [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]
diff --git a/langpacks/croatian/Plugins/SendSS.txt b/langpacks/croatian/Plugins/SendSS.txt
index 0fc2c54c60..5b72628a23 100644
--- a/langpacks/croatian/Plugins/SendSS.txt
+++ b/langpacks/croatian/Plugins/SendSS.txt
@@ -206,7 +206,7 @@ Strelica dolje
 
 [Screenshots]
 
-[Image services (AdvaImg) not found.\nSendSS disabled.]
+[Image services (AdvaImg plugin) not found.\nSendSS disabled.]
 
 [Buttons]
 
diff --git a/langpacks/croatian/Plugins/Tipper.txt b/langpacks/croatian/Plugins/Tipper.txt
index acd68e607b..5d9c079e14 100644
--- a/langpacks/croatian/Plugins/Tipper.txt
+++ b/langpacks/croatian/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]
diff --git a/langpacks/croatian/Plugins/TooltipNotify.txt b/langpacks/croatian/Plugins/TooltipNotify.txt
index b44c65bd80..5e3c01936f 100644
--- a/langpacks/croatian/Plugins/TooltipNotify.txt
+++ b/langpacks/croatian/Plugins/TooltipNotify.txt
@@ -73,14 +73,8 @@ opcije translucencije
 
 [Other status]
 
-[Tooltip Notify: Online]
-
-[Tooltip Notify: Offline]
-
-[Tooltip Notify: Other]
-
-[Tooltip Notify: Typing]
-
+[Other]
+Drugo
 [Popups]
 
 [** New contacts **]
diff --git a/langpacks/croatian/Plugins/Tox.txt b/langpacks/croatian/Plugins/Tox.txt
index da17bdc505..f7b43b14da 100644
--- a/langpacks/croatian/Plugins/Tox.txt
+++ b/langpacks/croatian/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/croatian/Plugins/Yahoo.txt b/langpacks/croatian/Plugins/Yahoo.txt
index e44da7a834..4ee571295f 100644
--- a/langpacks/croatian/Plugins/Yahoo.txt
+++ b/langpacks/croatian/Plugins/Yahoo.txt
@@ -167,9 +167,9 @@ Detalji o &Korisniku
 
 [ID]
 
-[Please enter your Yahoo ID in Options/Network/Yahoo]
+[Please enter your Yahoo ID in Options -> Network -> Yahoo]
 
-[Please enter your Yahoo password in Options/Network/Yahoo]
+[Please enter your Yahoo password in Options -> Network -> Yahoo]
 
 [Yahoo Login Error]
 
diff --git a/langpacks/croatian/Untranslated/=CORE=.txt b/langpacks/croatian/Untranslated/=CORE=.txt
index 5480e4473e..604b93c692 100644
--- a/langpacks/croatian/Untranslated/=CORE=.txt
+++ b/langpacks/croatian/Untranslated/=CORE=.txt
@@ -1037,8 +1037,8 @@
 [Could not write contact protocol to metacontact]
 [Could not write unique ID of contact to metacontact]
 [Could not write nickname of contact to metacontact]
-[&Move to group]
 [<Root group>]
+[&Move to group]
 [Standard Netlib log]
 [No times]
 [Standard hh:mm:ss times]
diff --git a/langpacks/croatian/Untranslated/AIM.txt b/langpacks/croatian/Untranslated/AIM.txt
index caecdbe076..463a678dbb 100644
--- a/langpacks/croatian/Untranslated/AIM.txt
+++ b/langpacks/croatian/Untranslated/AIM.txt
@@ -132,7 +132,7 @@
 [%s Protocol]
 [Open mail account?]
 [%s server connection]
-[%s Client-to-client connection]
+[%s client-to-client connections]
 [[Auto-Response]:]
 [Contact tried to open an audio/video conference (not currently supported)]
 [No information has been provided by the server.]
diff --git a/langpacks/croatian/Untranslated/AVS.txt b/langpacks/croatian/Untranslated/AVS.txt
index 52968dd435..f0c9d32ba1 100644
--- a/langpacks/croatian/Untranslated/AVS.txt
+++ b/langpacks/croatian/Untranslated/AVS.txt
@@ -2,7 +2,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/croatian/Untranslated/Clist_modern.txt b/langpacks/croatian/Untranslated/Clist_modern.txt
index db7525d26b..2dd25f9526 100644
--- a/langpacks/croatian/Untranslated/Clist_modern.txt
+++ b/langpacks/croatian/Untranslated/Clist_modern.txt
@@ -264,10 +264,10 @@
 [&Position]
 [&Up]
 [&Down]
+[Lock frame]
 [Show all frames]
 [Show all title bars]
 [Hide all title bars]
-[Lock frame]
 [&Hide/show]
 [&Find/add contacts...]
 [&Options...]
diff --git a/langpacks/croatian/Untranslated/Clist_nicer.txt b/langpacks/croatian/Untranslated/Clist_nicer.txt
index ac405c493e..6f4023f427 100644
--- a/langpacks/croatian/Untranslated/Clist_nicer.txt
+++ b/langpacks/croatian/Untranslated/Clist_nicer.txt
@@ -4,7 +4,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]
@@ -160,7 +160,7 @@
 [Appear always online]
 [Appear always offline (block contact)]
 [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:]
@@ -289,13 +289,13 @@
 [&Position]
 [&Up]
 [&Down]
-[Show all frames]
-[Show all title bars]
-[Hide all title bars]
 [Lock frame]
 [Visible]
 [Skinned frame]
 [Floating]
+[Show all frames]
+[Show all title bars]
+[Hide all title bars]
 [Title bar]
 [Tool Window]
 [Thin border]
diff --git a/langpacks/croatian/Untranslated/Contacts.txt b/langpacks/croatian/Untranslated/Contacts.txt
index 227295bfcc..6f4b02b0b9 100644
--- a/langpacks/croatian/Untranslated/Contacts.txt
+++ b/langpacks/croatian/Untranslated/Contacts.txt
@@ -16,6 +16,7 @@
 [Send Message]
 [Contacts received from]
 [Contacts]
+[Events]
 [Incoming Contacts]
 [Outgoing Contacts]
 [Nick]
diff --git a/langpacks/croatian/Untranslated/Facebook.txt b/langpacks/croatian/Untranslated/Facebook.txt
index de0401afb9..302fddaaa8 100644
--- a/langpacks/croatian/Untranslated/Facebook.txt
+++ b/langpacks/croatian/Untranslated/Facebook.txt
@@ -34,7 +34,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/croatian/Untranslated/FileAsMessage.txt b/langpacks/croatian/Untranslated/FileAsMessage.txt
index 7e16778411..df21221553 100644
--- a/langpacks/croatian/Untranslated/FileAsMessage.txt
+++ b/langpacks/croatian/Untranslated/FileAsMessage.txt
@@ -13,7 +13,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 already exists. Overwrite?]
 [Couldn't open a file]
 [Size: %d bytes]
diff --git a/langpacks/croatian/Untranslated/Msg_Export.txt b/langpacks/croatian/Untranslated/Msg_Export.txt
index b0f736d0d0..2b75747f55 100644
--- a/langpacks/croatian/Untranslated/Msg_Export.txt
+++ b/langpacks/croatian/Untranslated/Msg_Export.txt
@@ -27,12 +27,12 @@
 [Debug]
 [Export selected]
 [Set to default filename]
-[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/croatian/Untranslated/Popup.txt b/langpacks/croatian/Untranslated/Popup.txt
index fd5c31aa89..75888b5687 100644
--- a/langpacks/croatian/Untranslated/Popup.txt
+++ b/langpacks/croatian/Untranslated/Popup.txt
@@ -1,6 +1,6 @@
 [Provides popup notification services for different plugins.]
-[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]
@@ -69,7 +69,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]
@@ -141,7 +141,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.]
 [No effect]
 [Fade in/out]
@@ -168,7 +168,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]
 [Failed to register %s class.]
 [Skin preview]
 [Just take a look at this skin... ;)]
@@ -183,7 +183,7 @@
 [Failed to GetClassInfoExW from EDIT class.]
 [Failed to register custom edit box window class.\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.]
 [Auto]
 [Favorite]
 [Block]
diff --git a/langpacks/croatian/Untranslated/SendSS.txt b/langpacks/croatian/Untranslated/SendSS.txt
index cb85b7d3be..a89de72174 100644
--- a/langpacks/croatian/Untranslated/SendSS.txt
+++ b/langpacks/croatian/Untranslated/SendSS.txt
@@ -86,7 +86,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/croatian/Untranslated/Tipper.txt b/langpacks/croatian/Untranslated/Tipper.txt
index 859e935c4c..3f802b7b55 100644
--- a/langpacks/croatian/Untranslated/Tipper.txt
+++ b/langpacks/croatian/Untranslated/Tipper.txt
@@ -1,4 +1,4 @@
-[Tool Tip notification windows.]
+[Tooltip notification windows.]
 [Layout]
 [Text indent:]
 [Title indent:]
diff --git a/langpacks/croatian/Untranslated/TooltipNotify.txt b/langpacks/croatian/Untranslated/TooltipNotify.txt
index b75f923153..7291ceb574 100644
--- a/langpacks/croatian/Untranslated/TooltipNotify.txt
+++ b/langpacks/croatian/Untranslated/TooltipNotify.txt
@@ -30,10 +30,6 @@
 [Idle]
 [Tooltip Notify]
 [Other status]
-[Tooltip Notify: Online]
-[Tooltip Notify: Offline]
-[Tooltip Notify: Other]
-[Tooltip Notify: Typing]
 [Popups]
 [** New contacts **]
 [** Unknown contacts **]
diff --git a/langpacks/croatian/Untranslated/Yahoo.txt b/langpacks/croatian/Untranslated/Yahoo.txt
index acec7695c8..d2f573d9b2 100644
--- a/langpacks/croatian/Untranslated/Yahoo.txt
+++ b/langpacks/croatian/Untranslated/Yahoo.txt
@@ -71,8 +71,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]
 [You need to be connected to set the custom message]
 [You need to be connected to refresh your buddy list]
diff --git a/langpacks/english_gb/Plugins/Facebook.txt b/langpacks/english_gb/Plugins/Facebook.txt
index 6ad12ed167..e55ee145fd 100644
--- a/langpacks/english_gb/Plugins/Facebook.txt
+++ b/langpacks/english_gb/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
 ;============================================================
 [History synchronization]
diff --git a/langpacks/english_gb/Plugins/Popup.txt b/langpacks/english_gb/Plugins/Popup.txt
index 2a79d3e143..f00e789a9c 100644
--- a/langpacks/english_gb/Plugins/Popup.txt
+++ b/langpacks/english_gb/Plugins/Popup.txt
@@ -5,10 +5,10 @@
 ;  Version: 2.1.1.11
 ;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)
 ;============================================================
-[Go to Customize > Fonts && Colors for fonts and colors options]
-Go to Customise > Fonts && Colours for fonts and colours options
-[Colors can be configured in\r\nCustomize > Fonts and colors]
-Colours can be configured in\r\nCustomise > Fonts and colours
+[Go to Customize -> Fonts and Colors for fonts and colors options]
+Go to Customise -> Fonts and Colours for fonts and colours options
+[Colors can be configured in\r\nCustomize -> Fonts and colors]
+Colours can be configured in\r\nCustomise -> Fonts and colours
 [With "favorite" overlay]
 With "favourite" overlay
 [Favorite contact]
diff --git a/langpacks/english_gb/Plugins/Tox.txt b/langpacks/english_gb/Plugins/Tox.txt
index ecbf5e24bf..58c719964d 100644
--- a/langpacks/english_gb/Plugins/Tox.txt
+++ b/langpacks/english_gb/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
 ;============================================================
 [Unable to initialize Tox core]
diff --git a/langpacks/french/=CORE=.txt b/langpacks/french/=CORE=.txt
index 32989ff5ed..6924867a84 100644
--- a/langpacks/french/=CORE=.txt
+++ b/langpacks/french/=CORE=.txt
@@ -2461,10 +2461,10 @@ Impossible d'écrire l'ID du contact au metacontact
 [Could not write nickname of contact to metacontact]
 Impossible d'écrire le pseudo du contact au metacontact
 ;file \src\mir_app\src\movetogroup.cpp
-[&Move to group]
-&Déplacer vers le groupe
 [<Root group>]
 <sans groupe>
+[&Move to group]
+&Déplacer vers le groupe
 ;file \src\mir_app\src\netliblog.cpp
 [Standard Netlib log]
 
diff --git a/langpacks/french/Plugins/AIM.txt b/langpacks/french/Plugins/AIM.txt
index 4dd9f31482..917a413f30 100644
--- a/langpacks/french/Plugins/AIM.txt
+++ b/langpacks/french/Plugins/AIM.txt
@@ -288,8 +288,8 @@ Raccourci du protocole AIM
 ;file \protocols\AimOscar\src\proto.cpp
 [%s server connection]
 %s serveur connexion
-[%s Client-to-client connection]
-
+[%s client-to-client connections]
+%s client-to-client connexions
 ;file \protocols\AimOscar\src\server.cpp
 [[Auto-Response]:]
 {Auto-Response} :
diff --git a/langpacks/french/Plugins/AVS.txt b/langpacks/french/Plugins/AVS.txt
index cfc9ebabad..a6a79ee79e 100644
--- a/langpacks/french/Plugins/AVS.txt
+++ b/langpacks/french/Plugins/AVS.txt
@@ -14,7 +14,7 @@
 Changer d'image par défaut
 [Delete default picture]
 Effacer l'image
-[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)]
 Tenter de rendre l'arrière-plan transparent (pour des images sans transparence)
diff --git a/langpacks/french/Plugins/Clist_modern.txt b/langpacks/french/Plugins/Clist_modern.txt
index 669d6d254c..8bdbc5a9f5 100644
--- a/langpacks/french/Plugins/Clist_modern.txt
+++ b/langpacks/french/Plugins/Clist_modern.txt
@@ -619,14 +619,14 @@ Parti &manger\tCtrl+9
 &Vers le Haut
 [&Down]
 &Vers le Bas
+[Lock frame]
+Cadre vérouillé
 [Show all frames]
 Montrer tous les cadres
 [Show all title bars]
 Montrer toutes les barres de titres
 [Hide all title bars]
 Cacher toutes les barres de titres
-[Lock frame]
-Cadre vérouillé
 ;file \plugins\Clist_modern\src\groupmenu.cpp
 [&Hide/show]
 &Afficher/Cacher
diff --git a/langpacks/french/Plugins/Clist_nicer.txt b/langpacks/french/Plugins/Clist_nicer.txt
index 226f5fe254..d187c231fc 100644
--- a/langpacks/french/Plugins/Clist_nicer.txt
+++ b/langpacks/french/Plugins/Clist_nicer.txt
@@ -18,8 +18,8 @@ Continuer
 Quitter 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.]
 L'exception a été capturée et vous pouvez continuer à travailler avec Miranda, cependant vous devez redémarrer le programme dès que possible. L'exception peut avoir endommagé les structures de données internes et peut avoir un impact grave sur la stabilité.
-[About CList nicer]
-À propos de CList nicer
+[About Clist nicer]
+À propos de Clist nicer
 [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.]
@@ -424,8 +424,8 @@ Toujours apparaître déconnecté (contact bloqué)
 Autre
 [Hide this contact from the list]
 Cacher ce contact de la liste
-[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.]
-Pour afficher un contact bloqué, aller dans Paramètres -> Évènements -> Ignorer et cocher le contact en question.
+[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.]
+Pour afficher un contact bloqué, aller dans Paramètres -> Contacts -> Ignorer et cocher le contact en question.
 [Display options]
 Options d'affichage
 [Show contact with priority]
@@ -693,14 +693,6 @@ Image skinnée
 &Vers le Haut
 [&Down]
 &Vers le Bas
-[Frames]
-Cadres
-[Show all frames]
-Montrer tous les cadres
-[Show all title bars]
-Montrer toutes les barres de titres
-[Hide all title bars]
-Cacher toutes les barres de titres
 [Lock frame]
 Cadre vérouillé
 [Visible]
@@ -711,6 +703,14 @@ Afficher la barre de titre
 Image skinée
 [Floating]
 Flottant
+[Frames]
+Cadres
+[Show all frames]
+Montrer tous les cadres
+[Show all title bars]
+Montrer toutes les barres de titres
+[Hide all title bars]
+Cacher toutes les barres de titres
 ;file \plugins\Clist_nicer\src\cluiopts.cpp
 [Title bar]
 Barre de titre
diff --git a/langpacks/french/Plugins/Contacts.txt b/langpacks/french/Plugins/Contacts.txt
index a09d45e28e..0849df9182 100644
--- a/langpacks/french/Plugins/Contacts.txt
+++ b/langpacks/french/Plugins/Contacts.txt
@@ -53,6 +53,8 @@ Détails du contact
 
 [Contacts]
 Contacts
+[Events]
+Évènements
 [Incoming Contacts]
 Contacts entrants
 [Outgoing Contacts]
diff --git a/langpacks/french/Plugins/Facebook.txt b/langpacks/french/Plugins/Facebook.txt
index ff3bd45104..e4f34d2fc1 100644
--- a/langpacks/french/Plugins/Facebook.txt
+++ b/langpacks/french/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.]
@@ -80,7 +80,7 @@ Aperçu
 Poster les statuts de Miranda sur le mur
 [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)]
 
diff --git a/langpacks/french/Plugins/FileAsMessage.txt b/langpacks/french/Plugins/FileAsMessage.txt
index a706025e8b..362e70d083 100644
--- a/langpacks/french/Plugins/FileAsMessage.txt
+++ b/langpacks/french/Plugins/FileAsMessage.txt
@@ -36,7 +36,7 @@ Envoyé
 Reçu
 [Use only alphanumeric encoding on transfer]
 Veuillez utiliser uniquement de l'alphanumérique sur les transferts
-[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?]
diff --git a/langpacks/french/Plugins/Msg_Export.txt b/langpacks/french/Plugins/Msg_Export.txt
index 8584ddf19c..677997bd73 100644
--- a/langpacks/french/Plugins/Msg_Export.txt
+++ b/langpacks/french/Plugins/Msg_Export.txt
@@ -73,7 +73,7 @@ Remettre le nom de fichier par défaut
 [Copy]
 Copier
 ;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!]
 
@@ -81,9 +81,9 @@ Copier
 
 [Failed to execute external file view]
 
-[Failed to load Rich Edit ( Msftedit.DLL )]
+[Failed to load Rich Edit (Msftedit.dll)]
 
-[Failed to get handle to RichEdit!]
+[Failed to get handle to Rich Edit!]
 
 [Failed to open file\r\n%s\r\n\r\nContact handle is invalid]
 
diff --git a/langpacks/french/Plugins/Popup.txt b/langpacks/french/Plugins/Popup.txt
index 109d12c401..917a7c2d76 100644
--- a/langpacks/french/Plugins/Popup.txt
+++ b/langpacks/french/Plugins/Popup.txt
@@ -8,9 +8,9 @@
 [Provides popup notification services for different plugins.]
 
 ;file \plugins\Popup\res\resource.rc
-[Content && Style]
-Contenu && Style
-[Go to Customize > Fonts && Colors for fonts and colors options]
+[Content and Style]
+Contenu et Style
+[Go to Customize -> Fonts and Colors for fonts and colors options]
 
 [Miscellaneous]
 Divers
@@ -150,7 +150,7 @@ Clic gauche :
 Désactiver si l'état général est :
 [Disable when relevant protocol's status is...]
 Désactiver si l'état du protocole est :
-[Colors can be configured in\r\nCustomize > Fonts and colors]
+[Colors can be configured in\r\nCustomize -> Fonts and colors]
 
 [More...]
 
@@ -315,7 +315,7 @@ Avancé
 
 [Disable Popups]
 
-[Popup Plus]
+[Popup plus]
 
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 
@@ -372,7 +372,7 @@ Angle haut droit
 
 ['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]
 Avertissement de Popup Plus
 ;file \plugins\Popup\src\opt_skins.cpp
 [Failed to register %s class.]
@@ -407,7 +407,7 @@ Rafraîchir
 [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]
diff --git a/langpacks/french/Plugins/SendSS.txt b/langpacks/french/Plugins/SendSS.txt
index 5215e5fd48..566a571e9e 100644
--- a/langpacks/french/Plugins/SendSS.txt
+++ b/langpacks/french/Plugins/SendSS.txt
@@ -206,7 +206,7 @@ Flèche bas
 
 [Screenshots]
 
-[Image services (AdvaImg) not found.\nSendSS disabled.]
+[Image services (AdvaImg plugin) not found.\nSendSS disabled.]
 
 [Buttons]
 
diff --git a/langpacks/french/Plugins/Tipper.txt b/langpacks/french/Plugins/Tipper.txt
index c162e24fef..b642ed00af 100644
--- a/langpacks/french/Plugins/Tipper.txt
+++ b/langpacks/french/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]
diff --git a/langpacks/french/Plugins/TooltipNotify.txt b/langpacks/french/Plugins/TooltipNotify.txt
index ab67dde4e3..1d7e67b4f5 100644
--- a/langpacks/french/Plugins/TooltipNotify.txt
+++ b/langpacks/french/Plugins/TooltipNotify.txt
@@ -73,14 +73,8 @@ Inactif
 
 [Other status]
 
-[Tooltip Notify: Online]
-
-[Tooltip Notify: Offline]
-
-[Tooltip Notify: Other]
-
-[Tooltip Notify: Typing]
-
+[Other]
+Autre
 [Popups]
 Popups
 [** New contacts **]
diff --git a/langpacks/french/Plugins/Tox.txt b/langpacks/french/Plugins/Tox.txt
index f8c3249d04..47a07349d3 100644
--- a/langpacks/french/Plugins/Tox.txt
+++ b/langpacks/french/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/french/Plugins/Yahoo.txt b/langpacks/french/Plugins/Yahoo.txt
index e8c1d51186..8692cff179 100644
--- a/langpacks/french/Plugins/Yahoo.txt
+++ b/langpacks/french/Plugins/Yahoo.txt
@@ -167,10 +167,10 @@ Compte
 
 [ID]
 ID
-[Please enter your Yahoo ID in Options/Network/Yahoo]
-Veuillez entrer votre ID Yahoo dans Options/Réseaux/Yahoo
-[Please enter your Yahoo password in Options/Network/Yahoo]
-Veuillez entrer votre passe Yahoo dans Options/Réseaux/Yahoo
+[Please enter your Yahoo ID in Options -> Network -> Yahoo]
+Veuillez entrer votre ID Yahoo dans Options -> Réseaux -> Yahoo
+[Please enter your Yahoo password in Options -> Network -> Yahoo]
+Veuillez entrer votre passe Yahoo dans Options -> Réseaux -> Yahoo
 [Yahoo Login Error]
 Erreur de login Yahoo
 ;file \protocols\Yahoo\src\services.cpp
diff --git a/langpacks/french/Untranslated/AIM.txt b/langpacks/french/Untranslated/AIM.txt
index 0720efe786..a694559db1 100644
--- a/langpacks/french/Untranslated/AIM.txt
+++ b/langpacks/french/Untranslated/AIM.txt
@@ -72,7 +72,6 @@
 [DNS Fail.]
 [Failed to open file: %s : %s]
 [Open mail account?]
-[%s Client-to-client connection]
 [Contact tried to open an audio/video conference (not currently supported)]
 [Error adding buddy (invalid ID or already in list?)]
 [Unknown error when adding buddy to list. Error code %#x]
diff --git a/langpacks/french/Untranslated/AVS.txt b/langpacks/french/Untranslated/AVS.txt
index 70cc9f8570..1574144723 100644
--- a/langpacks/french/Untranslated/AVS.txt
+++ b/langpacks/french/Untranslated/AVS.txt
@@ -1,6 +1,6 @@
 [Loads and manages contact pictures for other plugins.]
 [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.]
-[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.]
 [When setting avatars, always make them square]
 [This uses the same additional options as in "Contact avatars" tab]
 [Change]
diff --git a/langpacks/french/Untranslated/Clist_nicer.txt b/langpacks/french/Untranslated/Clist_nicer.txt
index 665d8246ac..56a0a1fa91 100644
--- a/langpacks/french/Untranslated/Clist_nicer.txt
+++ b/langpacks/french/Untranslated/Clist_nicer.txt
@@ -6,6 +6,7 @@
 [Tree gray out]
 [Sticky contacts]
 [Editing view mode]
+[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.]
 [Setup accounts]
 [Overlay icons]
 [Connecting icons]
diff --git a/langpacks/french/Untranslated/Facebook.txt b/langpacks/french/Untranslated/Facebook.txt
index 47ed2d3beb..f97b7b2e92 100644
--- a/langpacks/french/Untranslated/Facebook.txt
+++ b/langpacks/french/Untranslated/Facebook.txt
@@ -14,7 +14,7 @@
 [Use logging notifications into special chatroom]
 [Statuses]
 [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]
 [Show stickers as custom smileys (EXPERIMENTAL)]
diff --git a/langpacks/french/Untranslated/FileAsMessage.txt b/langpacks/french/Untranslated/FileAsMessage.txt
index 43b1d6ff14..eed4678c1c 100644
--- a/langpacks/french/Untranslated/FileAsMessage.txt
+++ b/langpacks/french/Untranslated/FileAsMessage.txt
@@ -1,6 +1,6 @@
 [File transfer by using the messaging services - as plain text.]
 [fileAsMessage]
-[Extra options: Events > File Transfers, "Receiving files" group]
+[Extra options: Events -> File Transfers, "Receiving files" group]
 [File already exists. Overwrite?]
 [Unknown command for "File As Message" was received]
 [Play]
diff --git a/langpacks/french/Untranslated/Msg_Export.txt b/langpacks/french/Untranslated/Msg_Export.txt
index dc20389d7c..ac7e313100 100644
--- a/langpacks/french/Untranslated/Msg_Export.txt
+++ b/langpacks/french/Untranslated/Msg_Export.txt
@@ -2,12 +2,12 @@
 [Browse]
 [Do nothing]
 [Debug]
-[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/french/Untranslated/Popup.txt b/langpacks/french/Untranslated/Popup.txt
index 8e19e57f5f..84fce7064d 100644
--- a/langpacks/french/Untranslated/Popup.txt
+++ b/langpacks/french/Untranslated/Popup.txt
@@ -1,5 +1,5 @@
 [Provides popup notification services for different plugins.]
-[Go to Customize > Fonts && Colors for fonts and colors options]
+[Go to Customize -> Fonts and Colors for fonts and colors options]
 [Round corners by]
 [Avatar size:]
 [Multimonitor]
@@ -18,7 +18,7 @@
 [Middle button]
 [Right button]
 [Popup timeout:]
-[Colors can be configured in\r\nCustomize > Fonts and colors]
+[Colors can be configured in\r\nCustomize -> Fonts and colors]
 [More...]
 [Per-contact settings]
 [Show default]
@@ -53,7 +53,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.]
 [No effect]
 [Fade in/out]
@@ -72,7 +72,7 @@
 [Failed to GetClassInfoExW from EDIT class.]
 [Failed to register custom edit box window class.\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.]
 [Auto]
 [Favorite]
 [Popup Mode: Auto]
diff --git a/langpacks/french/Untranslated/SendSS.txt b/langpacks/french/Untranslated/SendSS.txt
index a1702f2620..28d0cf8cca 100644
--- a/langpacks/french/Untranslated/SendSS.txt
+++ b/langpacks/french/Untranslated/SendSS.txt
@@ -56,7 +56,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.]
 [Open SendSS+]
diff --git a/langpacks/french/Untranslated/Tipper.txt b/langpacks/french/Untranslated/Tipper.txt
index db283a884a..fda90fe595 100644
--- a/langpacks/french/Untranslated/Tipper.txt
+++ b/langpacks/french/Untranslated/Tipper.txt
@@ -1,4 +1,4 @@
-[Tool Tip notification windows.]
+[Tooltip notification windows.]
 [Text indent:]
 [Title indent:]
 [Value indent:]
diff --git a/langpacks/french/Untranslated/TooltipNotify.txt b/langpacks/french/Untranslated/TooltipNotify.txt
index faec2020e4..6309d962f8 100644
--- a/langpacks/french/Untranslated/TooltipNotify.txt
+++ b/langpacks/french/Untranslated/TooltipNotify.txt
@@ -4,8 +4,4 @@
 [Misc]
 [Tooltip Notify]
 [Other status]
-[Tooltip Notify: Online]
-[Tooltip Notify: Offline]
-[Tooltip Notify: Other]
-[Tooltip Notify: Typing]
 [Not Idle]
diff --git a/langpacks/german/=CORE=.txt b/langpacks/german/=CORE=.txt
index 16204efca9..8a4455f3ce 100644
--- a/langpacks/german/=CORE=.txt
+++ b/langpacks/german/=CORE=.txt
@@ -2461,10 +2461,10 @@ Konnte eindeutige ID des Kontaktes nicht in Metakontakt schreiben
 [Could not write nickname of contact to metacontact]
 Konnte Nicknamen des Kontakts nicht in Metakontakt schreiben
 ;file \src\mir_app\src\movetogroup.cpp
-[&Move to group]
-Verschiebe in &Gruppe
 [<Root group>]
 <Hauptgruppe>
+[&Move to group]
+Verschiebe in &Gruppe
 ;file \src\mir_app\src\netliblog.cpp
 [Standard Netlib log]
 Standard Netlib Log
diff --git a/langpacks/german/Plugins/AIM.txt b/langpacks/german/Plugins/AIM.txt
index 6f7d35fd8c..9646dfcae9 100644
--- a/langpacks/german/Plugins/AIM.txt
+++ b/langpacks/german/Plugins/AIM.txt
@@ -288,8 +288,8 @@ Mailkonto öffnen?
 ;file \protocols\AimOscar\src\proto.cpp
 [%s server connection]
 %s Serververbindung
-[%s Client-to-client connection]
-%s Client-to-Client-Verbindung
+[%s client-to-client connections]
+%s Client-to-Client-Verbindungen
 ;file \protocols\AimOscar\src\server.cpp
 [[Auto-Response]:]
 \[Automatische Antwort]:
diff --git a/langpacks/german/Plugins/AVS.txt b/langpacks/german/Plugins/AVS.txt
index 218d05329e..0d69909fe5 100644
--- a/langpacks/german/Plugins/AVS.txt
+++ b/langpacks/german/Plugins/AVS.txt
@@ -14,8 +14,8 @@ Die hier eingestellten Bilder werden als Standard-Avatare für Kontakte genutzt,
 Standardbild setzen
 [Delete default picture]
 Standardbild löschen
-[CAUTION: These pictures are NOT your own avatars.\nTo set your own avatar go to Main menu -> View/change my details -> Avatars.]
-ACHTUNG: Bei diesen Bildern handelt es sich NICHT um die eigenen Avatare!\nDiese werden über das Hauptmenü unter 'Mein Profil ändern -> Avatar' festgelegt.
+[CAUTION: These pictures are NOT your own avatars.\nTo set your own avatar go to Main menu -> View/change my details -> Avatar.]
+ACHTUNG: Bei diesen Bildern handelt es sich NICHT um die eigenen Avatare!\nDiese werden über das Hauptmenü unter Mein Profil ändern -> Avatar festgelegt.
 [Try to draw avatar background transparent (for images without transparency)]
 Versuche Avatarhintergr. transparent darzust. (für Bilder ohne Transparenz)
 [Number of points to define background:]
diff --git a/langpacks/german/Plugins/Clist_modern.txt b/langpacks/german/Plugins/Clist_modern.txt
index 701a22b6cd..cded69cc0b 100644
--- a/langpacks/german/Plugins/Clist_modern.txt
+++ b/langpacks/german/Plugins/Clist_modern.txt
@@ -619,14 +619,14 @@ Mitte, &Kontakte
 A&uf
 [&Down]
 &Ab
+[Lock frame]
+Keine Größenänderung
 [Show all frames]
 Alle Frames anzeigen
 [Show all title bars]
 Alle Titelleisten anzeigen
 [Hide all title bars]
 Alle Titelleisten verstecken
-[Lock frame]
-Keine Größenänderung
 ;file \plugins\Clist_modern\src\groupmenu.cpp
 [&Hide/show]
 Zeigen/&Ausblenden
diff --git a/langpacks/german/Plugins/Clist_nicer.txt b/langpacks/german/Plugins/Clist_nicer.txt
index 81a54550e0..4d7796ec40 100644
--- a/langpacks/german/Plugins/Clist_nicer.txt
+++ b/langpacks/german/Plugins/Clist_nicer.txt
@@ -18,8 +18,8 @@ Wiederholen
 Miranda beenden
 [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.]
 Obwohl die Ausnahme abgefangen wurde und Sie mit Miranda weiterarbeiten können, sollten Sie das Programm baldestmöglich neu starten. Die Ausnahme könnte interne Datenstrukturen beschädigt haben und einen nennenswerten Einfluss auf die Stabilität ausüben.
-[About CList nicer]
-Über CList nicer
+[About Clist nicer]
+Über Clist nicer
 [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.]
@@ -424,8 +424,8 @@ Immer offline erscheinen bzw. Kontakt blockieren
 Sonstige
 [Hide this contact from the list]
 Kontakt nicht in der Kontaktliste anzeigen
-[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.]
-Um einen bereits versteckten Kontakt wieder einzublenden, unter Einstellungen -> Ereignisse -> Ignorieren einen Haken neben seinem Namen setzen.
+[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.]
+Um einen bereits versteckten Kontakt wieder einzublenden, unter Einstellungen -> Kontakte -> Ignorieren einen Haken neben seinem Namen setzen.
 [Display options]
 Anzeigeoptionen
 [Show contact with priority]
@@ -693,14 +693,6 @@ Unten
 A&uf
 [&Down]
 Ab
-[Frames]
-Frames
-[Show all frames]
-Alle Frames anzeigen
-[Show all title bars]
-Alle Titelleisten anzeigen
-[Hide all title bars]
-Alle Titelleisten verstecken
 [Lock frame]
 Keine Größenänderung
 [Visible]
@@ -711,6 +703,14 @@ Titelzeile anzeigen
 Skinnbarer Frame
 [Floating]
 Frei bewegend
+[Frames]
+Frames
+[Show all frames]
+Alle Frames anzeigen
+[Show all title bars]
+Alle Titelleisten anzeigen
+[Hide all title bars]
+Alle Titelleisten verstecken
 ;file \plugins\Clist_nicer\src\cluiopts.cpp
 [Title bar]
 Titelleiste
diff --git a/langpacks/german/Plugins/Contacts.txt b/langpacks/german/Plugins/Contacts.txt
index fa93fa0ca6..53ae16bda5 100644
--- a/langpacks/german/Plugins/Contacts.txt
+++ b/langpacks/german/Plugins/Contacts.txt
@@ -53,6 +53,8 @@ Nachricht senden
 Kontakte empfangen von
 [Contacts]
 Kontakte
+[Events]
+Ereignisse
 [Incoming Contacts]
 Eingehende Kontakte
 [Outgoing Contacts]
diff --git a/langpacks/german/Plugins/Facebook.txt b/langpacks/german/Plugins/Facebook.txt
index fdd67661b2..94fca81e99 100644
--- a/langpacks/german/Plugins/Facebook.txt
+++ b/langpacks/german/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.]
@@ -80,8 +80,8 @@ Status
 Miranda-Status auf die Pinnwand setzen
 [Turn off chat on Facebook when going to offline in Miranda]
 Facebook-Chat abmelden wenn Miranda offline geht
-[Map unsupported statuses to Invisible (instead of Online)]
-Nicht-unterstützte Status auf 'Unsichtbar' setzen (anstatt 'Online')
+[Map unsupported statuses to Invisible (instead of Away)]
+Nicht-unterstützte Status auf 'Unsichtbar' setzen (anstatt 'Abwesend')
 [Allow posting statuses to my pages (may slow down login)]
 Posten von Status auf meinen Seiten erlauben (kann Anmeldung verlangsamen)
 [Bots challenge test]
diff --git a/langpacks/german/Plugins/FileAsMessage.txt b/langpacks/german/Plugins/FileAsMessage.txt
index 0cf0cb9e3a..9e21f69ea9 100644
--- a/langpacks/german/Plugins/FileAsMessage.txt
+++ b/langpacks/german/Plugins/FileAsMessage.txt
@@ -36,7 +36,7 @@ Zu Senden
 Empfangen
 [Use only alphanumeric encoding on transfer]
 Nur alphanumerische Kodierung in Übertragungen verwenden
-[Extra options: Events > File Transfers, "Receiving files" group]
+[Extra options: Events -> File Transfers, "Receiving files" group]
 Weitere Einstellungen: Ereignisse -> Dateiübertragungen, Gruppe "Dateien empfangen"
 ;file \plugins\FileAsMessage\src\dialog.cpp
 [File already exists. Overwrite?]
diff --git a/langpacks/german/Plugins/Msg_Export.txt b/langpacks/german/Plugins/Msg_Export.txt
index edad97dc43..d3ef294d9a 100644
--- a/langpacks/german/Plugins/Msg_Export.txt
+++ b/langpacks/german/Plugins/Msg_Export.txt
@@ -73,7 +73,7 @@ Setze Standard-Dateiname
 [Copy]
 Kopieren
 ;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!]
 
@@ -81,9 +81,9 @@ Kopieren
 Interner Fehler! (lExtraRead >= 0)
 [Failed to execute external file view]
 
-[Failed to load Rich Edit ( Msftedit.DLL )]
+[Failed to load Rich Edit (Msftedit.dll)]
 
-[Failed to get handle to RichEdit!]
+[Failed to get handle to Rich Edit!]
 
 [Failed to open file\r\n%s\r\n\r\nContact handle is invalid]
 
diff --git a/langpacks/german/Plugins/Popup.txt b/langpacks/german/Plugins/Popup.txt
index a362799ec2..5bc9ffb732 100644
--- a/langpacks/german/Plugins/Popup.txt
+++ b/langpacks/german/Plugins/Popup.txt
@@ -8,10 +8,10 @@
 [Provides popup notification services for different plugins.]
 Stellt Popup-Benachrichtigungen für verschiedene andere Plugins bereit.
 ;file \plugins\Popup\res\resource.rc
-[Content && Style]
-Inhalt && Stil
-[Go to Customize > Fonts && Colors for fonts and colors options]
-Gehen Sie zu Customize -> Schriften && Farben für Schrift- und Farbeinstellungen.
+[Content and Style]
+Inhalt und Stil
+[Go to Customize -> Fonts and Colors for fonts and colors options]
+Gehen Sie zu Customize -> Schriften und Farben für Schrift- und Farbeinstellungen.
 [Miscellaneous]
 Sonstiges
 [Effects]
@@ -150,8 +150,8 @@ Rechtsklick-Aktion:
 Deaktivieren, wenn globaler Status...
 [Disable when relevant protocol's status is...]
 Deaktivieren, wenn Protokollstatus...
-[Colors can be configured in\r\nCustomize > Fonts and colors]
-Farbkonfiguration unter Customize -> Schriftarten
+[Colors can be configured in\r\nCustomize -> Fonts and colors]
+Farbkonfiguration unter Customize -> Schriften und Farben
 [More...]
 Mehr...
 [Disable if message window is open]
@@ -315,8 +315,8 @@ Popups ein-/ausschalten
 Popups aktivieren
 [Disable Popups]
 Popups deaktivieren
-[Popup Plus]
-Popup Plus
+[Popup plus]
+Popup plus
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 Fehler: Das Popup-Fensterklassenelement konnte nicht registriert werden.\r\nDas Plugin wird nicht funktionieren.
 ;file \plugins\Popup\src\opt_adv.cpp
@@ -372,8 +372,8 @@ Protokoll Status
 Werte kleiner als %d und größer als %d sind nicht zulässig.
 ['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]
 'Popups neu ordnen' ist momentan deaktiviert.\r\nDies kann Popups falsch darstellen, wenn Avatare\r\nund Textersetzungen verwendet werden (hauptsächlich NewXstatusNotify).\r\nWollen Sie die Popup Neuanordnung jetzt aktivieren?
-[Popup Plus Warning]
-Popup Plus Warnung
+[Popup plus warning]
+Popup plus Warnung
 ;file \plugins\Popup\src\opt_skins.cpp
 [Failed to register %s class.]
 Fehler beim Registrieren %s dieser Klasse.
@@ -407,7 +407,7 @@ Liste aktualisieren
 [Notify]
 Benachrichtigung
 ;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.]
 Der Skin, den Sie zu laden versuchen, wurde für\r\neine neuere Popup+-Version entwickelt und wird\r\nnicht korrekt angezeigt werden.\r\n\r\nBitte wählen Sie einen anderen Skin aus.
 ;file \plugins\Popup\src\srmm_menu.cpp
 [Auto]
diff --git a/langpacks/german/Plugins/SendSS.txt b/langpacks/german/Plugins/SendSS.txt
index a626519a19..3cb87be0e2 100644
--- a/langpacks/german/Plugins/SendSS.txt
+++ b/langpacks/german/Plugins/SendSS.txt
@@ -206,8 +206,8 @@ SendSS-HTTP-Verbindungen
 SendSS
 [Screenshots]
 Screenshots
-[Image services (AdvaImg) not found.\nSendSS disabled.]
-Bilderdienste (AdvaImg) nicht gefunden.\nSendSS deaktiviert.
+[Image services (AdvaImg plugin) not found.\nSendSS disabled.]
+Bilderdienste (AdvaImg-Plugin) nicht gefunden.\nSendSS deaktiviert.
 [Buttons]
 Schaltflächen
 [Could not register Miranda service.]
diff --git a/langpacks/german/Plugins/Tipper.txt b/langpacks/german/Plugins/Tipper.txt
index 1bab8e5078..ed10e956ee 100644
--- a/langpacks/german/Plugins/Tipper.txt
+++ b/langpacks/german/Plugins/Tipper.txt
@@ -5,8 +5,8 @@
 ;  Version: 2.1.0.7
 ;  Authors: Scott Ellis, yaho
 ;============================================================
-[Tool Tip notification windows.]
-ToolTip Fenster.
+[Tooltip notification windows.]
+Tooltip Fenster.
 ;file \plugins\TipperYM\res\resource.rc
 [Layout]
 Layout
diff --git a/langpacks/german/Plugins/TooltipNotify.txt b/langpacks/german/Plugins/TooltipNotify.txt
index 998a63695c..11fe65c3cc 100644
--- a/langpacks/german/Plugins/TooltipNotify.txt
+++ b/langpacks/german/Plugins/TooltipNotify.txt
@@ -73,14 +73,8 @@ Untätigkeit
 Tooltip-Benachrichtigung
 [Other status]
 Andere Status
-[Tooltip Notify: Online]
-Tooltip Notify: Online
-[Tooltip Notify: Offline]
-Tooltip Notify: Offline
-[Tooltip Notify: Other]
-Tooltip Notify: Andere
-[Tooltip Notify: Typing]
-Tooltip Notify: Tippen
+[Other]
+Sonstige
 [Popups]
 Popups
 [** New contacts **]
diff --git a/langpacks/german/Plugins/Tox.txt b/langpacks/german/Plugins/Tox.txt
index e24f5a476f..15db1e897f 100644
--- a/langpacks/german/Plugins/Tox.txt
+++ b/langpacks/german/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/german/Plugins/Yahoo.txt b/langpacks/german/Plugins/Yahoo.txt
index 187707f1d4..ef1dc2fc19 100644
--- a/langpacks/german/Plugins/Yahoo.txt
+++ b/langpacks/german/Plugins/Yahoo.txt
@@ -167,9 +167,9 @@ Neue E-Mail im Posteingang
 %s Pluginverbindungen
 [ID]
 ID
-[Please enter your Yahoo ID in Options/Network/Yahoo]
+[Please enter your Yahoo ID in Options -> Network -> Yahoo]
 Bitte die Yahoo-ID unter Einstellungen -> Netzwerk -> Yahoo eintragen!
-[Please enter your Yahoo password in Options/Network/Yahoo]
+[Please enter your Yahoo password in Options -> Network -> Yahoo]
 Bitte das Yahoo-Passwort unter Einstellungen -> Netzwerk -> Yahoo eintragen!
 [Yahoo Login Error]
 Yahoo-Anmeldefehler
diff --git a/langpacks/german/Untranslated/Msg_Export.txt b/langpacks/german/Untranslated/Msg_Export.txt
index 56449adb77..3601d2167b 100644
--- a/langpacks/german/Untranslated/Msg_Export.txt
+++ b/langpacks/german/Untranslated/Msg_Export.txt
@@ -1,8 +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 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/polish/=CORE=.txt b/langpacks/polish/=CORE=.txt
index cc4756c00b..a5e7d47afb 100644
--- a/langpacks/polish/=CORE=.txt
+++ b/langpacks/polish/=CORE=.txt
@@ -2461,10 +2461,10 @@ Nie udało się zapisać unikalnego ID kontaktu do metakontaktu
 [Could not write nickname of contact to metacontact]
 Nie udało się zapisać nicka kontaktu do metakontaktu
 ;file \src\mir_app\src\movetogroup.cpp
-[&Move to group]
-&Przenieś do grupy
 [<Root group>]
 <Grupa główna>
+[&Move to group]
+&Przenieś do grupy
 ;file \src\mir_app\src\netliblog.cpp
 [Standard Netlib log]
 Standardowy log Netlib
diff --git a/langpacks/polish/Plugins/AIM.txt b/langpacks/polish/Plugins/AIM.txt
index 60a016853a..e39b7fff8e 100644
--- a/langpacks/polish/Plugins/AIM.txt
+++ b/langpacks/polish/Plugins/AIM.txt
@@ -288,7 +288,7 @@ Otworzyć pocztę?
 ;file \protocols\AimOscar\src\proto.cpp
 [%s server connection]
 Połączenie %s
-[%s Client-to-client connection]
+[%s client-to-client connections]
 Połączenie Klient-do-Klienta %s
 ;file \protocols\AimOscar\src\server.cpp
 [[Auto-Response]:]
diff --git a/langpacks/polish/Plugins/AVS.txt b/langpacks/polish/Plugins/AVS.txt
index 737002ecad..8ddb8bc10e 100644
--- a/langpacks/polish/Plugins/AVS.txt
+++ b/langpacks/polish/Plugins/AVS.txt
@@ -14,8 +14,8 @@ Ustawione tutaj obrazki są wyświetlane jako domyślne awatary\ndla kontaktów
 Wybierz domyślny obrazek
 [Delete default picture]
 Usuń domyślny obrazek
-[CAUTION: These pictures are NOT your own avatars.\nTo set your own avatar go to Main menu -> View/change my details -> Avatars.]
-Uwaga: te obrazy nie są twoimi awatarami.\nAby ustawić swojego awatara, przejdź do Menu głównego -> Pokaż zmień moje dane -> Awatary.
+[CAUTION: These pictures are NOT your own avatars.\nTo set your own avatar go to Main menu -> View/change my details -> Avatar.]
+woimi awatarami.\nAby ustawić swojego awatara, przejdź do Menu głównego -> Pokaż/Zmień moje dane -> Awatar.
 [Try to draw avatar background transparent (for images without transparency)]
 Próbuj rysować przezroczyste tło awataru (dla obrazku bez przezroczystości)
 [Number of points to define background:]
diff --git a/langpacks/polish/Plugins/Clist_modern.txt b/langpacks/polish/Plugins/Clist_modern.txt
index 19dfa53b68..658a6bde05 100644
--- a/langpacks/polish/Plugins/Clist_modern.txt
+++ b/langpacks/polish/Plugins/Clist_modern.txt
@@ -619,14 +619,14 @@ Tryb &pływający
 &Góra
 [&Down]
 &Dół
+[Lock frame]
+Zablokuj ramkę
 [Show all frames]
 Pokaż wszystkie ramki
 [Show all title bars]
 Pokaż wszystkie paski tytułów
 [Hide all title bars]
 Ukryj wszystkie paski tytułów
-[Lock frame]
-Zablokuj ramkę
 ;file \plugins\Clist_modern\src\groupmenu.cpp
 [&Hide/show]
 &Ukryj/pokaż
diff --git a/langpacks/polish/Plugins/Clist_nicer.txt b/langpacks/polish/Plugins/Clist_nicer.txt
index 6e38107062..e1efa093fc 100644
--- a/langpacks/polish/Plugins/Clist_nicer.txt
+++ b/langpacks/polish/Plugins/Clist_nicer.txt
@@ -18,8 +18,8 @@ Kontynuuj
 Wyłącz Mirandę
 [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.]
 Mimo, że wyjątek został wyłapany i możesz kontynuować korzystanie z Mirandy, powinieneś uruchomić program ponownie najszybciej jak to możliwe. Wyjątek mógł uszkodzić wewnętrzne struktury danych i może mieć poważny wpływ na stabilność.
-[About CList nicer]
-O CList nicer
+[About Clist nicer]
+O Clist nicer
 [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.]
@@ -424,7 +424,7 @@ Zawsze rozłączony (kontakt zablokowany)
 Inne
 [Hide this contact from the list]
 Ukryj kontakt na liście kontaktów
-[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.]
 Aby wyświetlić wcześniej ukryty kontakt, przejdź do Opcje -> Kontakty -> Ignorowanie, wyszukaj kontakt na liście i zaznacz pole wyboru obok jego nazwy.
 [Display options]
 Opcje wyświetlania
@@ -693,14 +693,6 @@ W&yrównanie
 &Góra
 [&Down]
 &Dół
-[Frames]
-Ramki
-[Show all frames]
-Pokaż wszystkie ramki
-[Show all title bars]
-Pokaż wszystkie paski tytułów
-[Hide all title bars]
-Ukryj wszystkie paski tytułów
 [Lock frame]
 Zablokuj ramkę
 [Visible]
@@ -711,6 +703,14 @@ Pokaż pasek tytułu
 Skórkowalna ramka
 [Floating]
 Pływający
+[Frames]
+Ramki
+[Show all frames]
+Pokaż wszystkie ramki
+[Show all title bars]
+Pokaż wszystkie paski tytułów
+[Hide all title bars]
+Ukryj wszystkie paski tytułów
 ;file \plugins\Clist_nicer\src\cluiopts.cpp
 [Title bar]
 Nagłówek okna
diff --git a/langpacks/polish/Plugins/Contacts.txt b/langpacks/polish/Plugins/Contacts.txt
index d9f448516f..81d08e0d51 100644
--- a/langpacks/polish/Plugins/Contacts.txt
+++ b/langpacks/polish/Plugins/Contacts.txt
@@ -53,6 +53,8 @@ Wyślij wiadomość
 Otrzymano kontakty od
 [Contacts]
 Kontakty
+[Events]
+Zdarzenia
 [Incoming Contacts]
 Przychodzący kontakt
 [Outgoing Contacts]
diff --git a/langpacks/polish/Plugins/Facebook.txt b/langpacks/polish/Plugins/Facebook.txt
index b9d18c8de2..083bd989b2 100644
--- a/langpacks/polish/Plugins/Facebook.txt
+++ b/langpacks/polish/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.]
@@ -80,8 +80,8 @@ Statusy
 Pokazuj statusy Mirandy jako posty na Tablicy
 [Turn off chat on Facebook when going to offline in Miranda]
 Wyłącz czat Facebooka gdy rozłączasz się z Mirandą
-[Map unsupported statuses to Invisible (instead of Online)]
-Mapuj nieznane statusy jako niewidoczny zamiast dostępnego
+[Map unsupported statuses to Invisible (instead of Away)]
+
 [Allow posting statuses to my pages (may slow down login)]
 Zezwól na publikowanie postów na moich stronach (może spowolnić logowanie)
 [Bots challenge test]
diff --git a/langpacks/polish/Plugins/FileAsMessage.txt b/langpacks/polish/Plugins/FileAsMessage.txt
index 027969ed5c..99ea2c82f1 100644
--- a/langpacks/polish/Plugins/FileAsMessage.txt
+++ b/langpacks/polish/Plugins/FileAsMessage.txt
@@ -36,8 +36,8 @@ Do wysłania
 Otrzymany
 [Use only alphanumeric encoding on transfer]
 Używaj tylko alfa-numerycznego kodowania podczas transferu
-[Extra options: Events > File Transfers, "Receiving files" group]
-Więcej: Zdarzenia > Transfery plików, grupa "Odbieranie plików"
+[Extra options: Events -> File Transfers, "Receiving files" group]
+Więcej: Zdarzenia -> Transfery plików, grupa "Odbieranie plików"
 ;file \plugins\FileAsMessage\src\dialog.cpp
 [File already exists. Overwrite?]
 Plik już istnieje. Nadpisać?
diff --git a/langpacks/polish/Plugins/Msg_Export.txt b/langpacks/polish/Plugins/Msg_Export.txt
index a45e589c42..da9b558740 100644
--- a/langpacks/polish/Plugins/Msg_Export.txt
+++ b/langpacks/polish/Plugins/Msg_Export.txt
@@ -73,7 +73,7 @@ Ustaw domyślną nazwę pliku
 [Copy]
 Kopiuj
 ;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.]
 Nie udało się zapisać do pola edycji z formatowaniem, zbyt mały bufor.
 [Error: Optimal buffer size decreased to a too low size!]
 Błąd: optymalny rozmiar bufora został zmniejszony do zbyt małej wartości!
@@ -81,9 +81,9 @@ Błąd: optymalny rozmiar bufora został zmniejszony do zbyt małej wartości!
 Błąd wewnętrzny! (lExtraRead >= 0)
 [Failed to execute external file view]
 Nie udało się wykonać zewnętrznego widoku pliku
-[Failed to load Rich Edit ( Msftedit.DLL )]
-Nie udało się załadować pola edycji z formatowaniem ( Msftedit.dll )
-[Failed to get handle to RichEdit!]
+[Failed to load Rich Edit (Msftedit.dll)]
+Nie udało się załadować pola edycji z formatowaniem (Msftedit.dll)
+[Failed to get handle to Rich Edit!]
 Nie udało się otrzymać identyfikatora do pola edycji z formatowaniem!
 [Failed to open file\r\n%s\r\n\r\nContact handle is invalid]
 Nie udało się otworzyć pliku\r\n%s\r\n\r\nIdentyfikator kontaktu jest nieprawidłowy
diff --git a/langpacks/polish/Plugins/Popup.txt b/langpacks/polish/Plugins/Popup.txt
index c7cede78f7..bc8cf46240 100644
--- a/langpacks/polish/Plugins/Popup.txt
+++ b/langpacks/polish/Plugins/Popup.txt
@@ -8,10 +8,10 @@
 [Provides popup notification services for different plugins.]
 Dostarcza usługi powiadomień popup dla innych wtyczek.
 ;file \plugins\Popup\res\resource.rc
-[Content && Style]
+[Content and Style]
 Zawartość i wygląd
-[Go to Customize > Fonts && Colors for fonts and colors options]
-Przejdź do Dostosuj -> Czcionki żeby ustawić czcionki i kolory
+[Go to Customize -> Fonts and Colors for fonts and colors options]
+Przejdź do Dostosuj -> Czcionki i kolory żeby ustawić czcionki i kolory
 [Miscellaneous]
 Różne
 [Effects]
@@ -150,8 +150,8 @@ Akcja PPM:
 Wyłącz, kiedy globalny status to...
 [Disable when relevant protocol's status is...]
 Wyłącz, jeśli stosowany status protokołu to...
-[Colors can be configured in\r\nCustomize > Fonts and colors]
-Kolory mogą zostać skonfigurowane w\r\nPersonalizacja > Czcionki i kolory
+[Colors can be configured in\r\nCustomize -> Fonts and colors]
+Kolory mogą zostać skonfigurowane w\r\nPersonalizacja -> Czcionki i kolory
 [More...]
 Więcej...
 [Disable if message window is open]
@@ -315,7 +315,7 @@ Włącz/Wyłącz popupy
 Włącz popupy
 [Disable Popups]
 Wyłącz popupy
-[Popup Plus]
+[Popup plus]
 Popupy
 [Error: I could not register the Popup Window class.\r\nThe plugin will not operate.]
 Błąd: Nie mogłem zarejestrować klasy okna Popup\r\nWtyczka nie będzie działać.
@@ -372,8 +372,8 @@ Status protokołu
 Nie możesz ustawić wartości niższej niż %d ani wyższej niż %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]
 Opcja "Zmień kolejność popupów" jest obecnie wyłączona.\r\nTo może spowodować nieprawidłowo wyrównane Popupy w połączeniu z\r\nawatarami and zamianą tekstu\ngłównie NewXstatusNotify).\r\n\r\nCzy chcesz teraz włączyć zmianę kolejności popupów?\r\n
-[Popup Plus Warning]
-Ostrzeżenie Popup Plus
+[Popup plus warning]
+Ostrzeżenie Popup plus
 ;file \plugins\Popup\src\opt_skins.cpp
 [Failed to register %s class.]
 Nie udało się zarejestrować klasy %s.
@@ -407,8 +407,8 @@ Nie udało się zarejestrować własnej klasy okna pola edycji.\r\n\r\nMIN %hd m
 [Notify]
 Powiadomienia
 ;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.]
-Skórka, którą próbujesz załadować jest zaprojektowana\r\ndla nowszej wersji Popup+. I nie będzie\r\nwyświetlać się poprawnie.\r\n\r\nProszę wybrać inną skórkę.
+[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.]
+Skórka, którą próbujesz załadować jest zaprojektowana\r\ndla nowszej wersji Popup plus. I nie będzie\r\nwyświetlać się poprawnie.\r\n\r\nProszę wybrać inną skórkę.
 ;file \plugins\Popup\src\srmm_menu.cpp
 [Auto]
 Automatyczny
diff --git a/langpacks/polish/Plugins/SendSS.txt b/langpacks/polish/Plugins/SendSS.txt
index e1039a730d..aeb1b3db29 100644
--- a/langpacks/polish/Plugins/SendSS.txt
+++ b/langpacks/polish/Plugins/SendSS.txt
@@ -206,7 +206,7 @@ Połączenie HTTP SendSS
 Wyślij zrzut ekranu
 [Screenshots]
 Zrzuty ekranu
-[Image services (AdvaImg) not found.\nSendSS disabled.]
+[Image services (AdvaImg plugin) not found.\nSendSS disabled.]
 Nie znaleziono usług obrazów (AdvaImg).\nSendSS wyłączony.
 [Buttons]
 Przyciski
diff --git a/langpacks/polish/Plugins/Tipper.txt b/langpacks/polish/Plugins/Tipper.txt
index df5669ed49..df2f3db351 100644
--- a/langpacks/polish/Plugins/Tipper.txt
+++ b/langpacks/polish/Plugins/Tipper.txt
@@ -5,7 +5,7 @@
 ;  Version: 2.1.0.7
 ;  Authors: Scott Ellis, yaho
 ;============================================================
-[Tool Tip notification windows.]
+[Tooltip notification windows.]
 Informacje o kontaktach i programie w wyskakujących okienkach.
 ;file \plugins\TipperYM\res\resource.rc
 [Layout]
diff --git a/langpacks/polish/Plugins/TooltipNotify.txt b/langpacks/polish/Plugins/TooltipNotify.txt
index 57ee12d56d..df8aeeaa10 100644
--- a/langpacks/polish/Plugins/TooltipNotify.txt
+++ b/langpacks/polish/Plugins/TooltipNotify.txt
@@ -73,14 +73,8 @@ Bezczynność
 Powiadomienia
 [Other status]
 Inny status
-[Tooltip Notify: Online]
-Powiadomienia: Dostępny
-[Tooltip Notify: Offline]
-Powiadomienia: Rozłączony
-[Tooltip Notify: Other]
-Powiadomienia: Inne
-[Tooltip Notify: Typing]
-Powiadomienia: Pisanie
+[Other]
+Inne
 [Popups]
 Popupy
 [** New contacts **]
diff --git a/langpacks/polish/Plugins/Tox.txt b/langpacks/polish/Plugins/Tox.txt
index c21aff20e1..a61ce0a2c7 100644
--- a/langpacks/polish/Plugins/Tox.txt
+++ b/langpacks/polish/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/polish/Plugins/Yahoo.txt b/langpacks/polish/Plugins/Yahoo.txt
index 352f5cbbdb..1ee62a5f16 100644
--- a/langpacks/polish/Plugins/Yahoo.txt
+++ b/langpacks/polish/Plugins/Yahoo.txt
@@ -167,9 +167,9 @@ Nowy e-mail w skrzynce
 Połączenie %s
 [ID]
 ID
-[Please enter your Yahoo ID in Options/Network/Yahoo]
+[Please enter your Yahoo ID in Options -> Network -> Yahoo]
 Podaj swój Yahoo ID w Opcje -> Protokoły -> Yahoo
-[Please enter your Yahoo password in Options/Network/Yahoo]
+[Please enter your Yahoo password in Options -> Network -> Yahoo]
 Podaj swoje hasło Yahoo w Opcje -> Protokoły -> Yahoo
 [Yahoo Login Error]
 Błąd logowania Yahoo
diff --git a/langpacks/polish/Untranslated/Facebook.txt b/langpacks/polish/Untranslated/Facebook.txt
new file mode 100644
index 0000000000..4ddd5143c0
--- /dev/null
+++ b/langpacks/polish/Untranslated/Facebook.txt
@@ -0,0 +1 @@
+[Map unsupported statuses to Invisible (instead of Away)]
diff --git a/langpacks/polish/Untranslated/MRA.txt b/langpacks/polish/Untranslated/MRA.txt
deleted file mode 100644
index 8b41856d81..0000000000
--- a/langpacks/polish/Untranslated/MRA.txt
+++ /dev/null
@@ -1 +0,0 @@
-[Chat plugin is required for conferences. Install it before chatting]
-\ No newline at end of file
diff --git a/langpacks/polish/Untranslated/WebView.txt b/langpacks/polish/Untranslated/WebView.txt
deleted file mode 100644
index 6ae017a534..0000000000
--- a/langpacks/polish/Untranslated/WebView.txt
+++ /dev/null
@@ -1 +0,0 @@
-[Display using popup or OSD plugin]
-\ No newline at end of file
diff --git a/langpacks/russian/Plugins/Clist_nicer.txt b/langpacks/russian/Plugins/Clist_nicer.txt
index 5990b6328c..595a5f164b 100644
--- a/langpacks/russian/Plugins/Clist_nicer.txt
+++ b/langpacks/russian/Plugins/Clist_nicer.txt
@@ -18,7 +18,7 @@
 [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]
-О плагине 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.
 [Version]